Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DLV Serendipity #2132

Merged
merged 201 commits into from
Mar 10, 2023
Merged

DLV Serendipity #2132

Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
201 commits
Select commit Hold shift + click to select a range
737ae65
Adding Map
BetaCentari Aug 28, 2022
98970da
Create serendipity.json
BetaCentari Aug 28, 2022
2137340
Changes to Ship, banners added
BetaCentari Aug 29, 2022
00731a3
Adds autoinjectors, banner sprites, incense, limb grower and other i…
BetaCentari Aug 29, 2022
541af49
Adds Rando Spawner that can spawn shield gen
BetaCentari Aug 30, 2022
5d59b8c
Map edits, more organs for limbgrower and research tree
BetaCentari Aug 31, 2022
6f3047f
Update nsv13.dme
BetaCentari Aug 31, 2022
88f1b00
Needed map updates and makes all weapon ammunition movable in zero-g
BetaCentari Sep 6, 2022
c1266d5
Adds new emotes and sounds, map updates, celerity escape shuttle and …
BetaCentari Sep 7, 2022
7ed3c90
Adds new sprite for replicator, map changes, adds custom shuttle and …
BetaCentari Sep 7, 2022
2d4181c
Adds required job changes, map updates, the arrival shuttle, emergenc…
BetaCentari Sep 9, 2022
aa4814a
Map changes, adds custom hardsuits for mining, engi, atmo, and EVA.
BetaCentari Sep 9, 2022
c29ae5f
Map Update and icon update
BetaCentari Sep 11, 2022
5b6f681
Map Updates
BetaCentari Sep 13, 2022
469761c
Fixes Pixel_Y = 0
BetaCentari Sep 13, 2022
022528f
Hopefully fixes the thing
BetaCentari Sep 13, 2022
9a27e4b
Map Updates, Attempted tgui fixes
BetaCentari Sep 13, 2022
2f0bb9c
Map Updates TGUI again
BetaCentari Sep 13, 2022
29cea3d
Map Updates (again again)
BetaCentari Sep 13, 2022
1ef8533
Update Serendipity2.dmm
BetaCentari Sep 13, 2022
ad57bc5
Attempts at adding custom cargo
BetaCentari Sep 15, 2022
4137a63
Map updates, makes dominion (and muni banner) work properly
BetaCentari Sep 20, 2022
412f963
Updating Sprites, minor code changes,
BetaCentari Sep 24, 2022
93e94b0
Changes to organgrower sprites
BetaCentari Sep 27, 2022
0689773
Adds iguana activation and deactivation
BetaCentari Sep 29, 2022
e0a6f12
Map Updates (Thanks Altangy)
BetaCentari Oct 3, 2022
42c6107
Adding Tiny Library
BetaCentari Oct 5, 2022
f946600
Reverts Emote Changes
BetaCentari Oct 12, 2022
49fe9e9
ornate spear name
BetaCentari Oct 12, 2022
677ee65
Map fixes
BetaCentari Oct 18, 2022
2257802
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Oct 18, 2022
d3a7e30
Fixed map according to rebase
BetaCentari Oct 18, 2022
be3cb24
Update Serendipity2.dmm
BetaCentari Oct 18, 2022
cc73477
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Oct 27, 2022
419f151
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Nov 2, 2022
60dc203
Fixes many issues with Beebase
BetaCentari Nov 2, 2022
e7ea639
Fixes EVERYTHING from Beebase
BetaCentari Nov 2, 2022
a960cba
Update organgrower.dm
BetaCentari Nov 2, 2022
e59c8d2
Linters Fixed?
BetaCentari Nov 2, 2022
cb2b06d
Fixing linters again
BetaCentari Nov 2, 2022
2c63f85
Linters again again
BetaCentari Nov 2, 2022
15497c8
Update emergency_celerity.dmm
BetaCentari Nov 2, 2022
4fbe467
Adds new ship variant for event, properly names the serendipity
BetaCentari Nov 3, 2022
3a23cc4
Requested Change, also moved .dmi file into correct folder
BetaCentari Nov 3, 2022
11518ba
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Nov 3, 2022
50e6f8a
Requested changes
BetaCentari Nov 6, 2022
747e4e9
Reverting change
BetaCentari Nov 6, 2022
f8d3361
Revert "Reverting change"
BetaCentari Nov 6, 2022
eab0a09
Revert "Requested changes"
BetaCentari Nov 6, 2022
3b2a976
Sorts Serendipity properly in nanotrasen.dm
BetaCentari Nov 6, 2022
24acb43
Reverts zero g drag of muni
BetaCentari Nov 6, 2022
19e266f
Fixes spelling mistake
BetaCentari Nov 6, 2022
f65cb11
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Nov 15, 2022
c7e15b5
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Nov 26, 2022
4698fd3
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Nov 26, 2022
a2bf4e4
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Dec 16, 2022
cdb3d2c
Adds Event Map+Json
BetaCentari Dec 22, 2022
a99e4dc
Update SerendipityEvent.dmm
BetaCentari Dec 22, 2022
92c3498
Fixing Linters
BetaCentari Dec 22, 2022
68482c0
Fixes areas
BetaCentari Dec 22, 2022
41bcf85
Map Updates
BetaCentari Dec 22, 2022
90b47f3
Update SerendipityEvent.dmm
BetaCentari Dec 22, 2022
fec3a9c
Trying to get the event specific to work
BetaCentari Dec 23, 2022
a950e64
FIXES THE SHIELD THINGIE (And map fixes)
BetaCentari Dec 23, 2022
5fcd216
APC removal
BetaCentari Dec 23, 2022
a986e43
Requested Map Updates
BetaCentari Dec 29, 2022
6e20c46
Silly little helmets do silly little things
BetaCentari Dec 30, 2022
f597c5b
Big Patch to Fix (Thank you for understanding yes)
BetaCentari Dec 30, 2022
d917746
Update Serendipity2.dmm
BetaCentari Dec 30, 2022
8cbf0ef
fixes air mix injector
BetaCentari Dec 30, 2022
4f96d13
Buncha more hotfixes
BetaCentari Dec 31, 2022
888337f
RECHARGERS IN SEC
BetaCentari Dec 31, 2022
43572e0
Update Serendipity2.dmm
BetaCentari Dec 31, 2022
5d457d8
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Jan 6, 2023
8cff669
Update nsv_circuitboards.dm
BetaCentari Jan 6, 2023
dc7f5d1
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Jan 8, 2023
a27d9c8
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Jan 9, 2023
099a061
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Jan 9, 2023
092b4b0
Fixes, cycle helpers, public medical kits, crew mon, med records etc …
BetaCentari Jan 9, 2023
8543c1c
Fixes docking on the Serendipity, minor map changes
BetaCentari Jan 9, 2023
d7af176
A few more spare public tools
BetaCentari Jan 9, 2023
adb8658
Seals Security In (Nice and Tight)
BetaCentari Jan 9, 2023
415deb8
Seals Sec, Adds prebuilt torps
BetaCentari Jan 9, 2023
f8a0c7e
Update Serendipity2.dmm
BetaCentari Jan 9, 2023
c1f8fd1
One pilot slot as a treat
BetaCentari Jan 13, 2023
24eac7e
Armsky
BetaCentari Jan 13, 2023
92a6460
Hangar Now Muni Cart Friendly (Light cannon ammo)
BetaCentari Jan 14, 2023
77447fc
Some better grammar and labels.
BetaCentari Jan 14, 2023
005fb9a
Damned snowdin
BetaCentari Jan 14, 2023
9dd4e03
Prevents Atmos Gameplay
BetaCentari Jan 14, 2023
f1a1ad4
Does the desc
BetaCentari Jan 14, 2023
7377372
Adds bot elevators and enables multi-z patrolling.
Bobbanz1 Jan 15, 2023
fc0a23b
Merge branch 'DLV-Serendipity' of https://github.com/BetaCentari/NSV1…
Bobbanz1 Jan 15, 2023
16be20e
Main Push
BetaCentari Jan 15, 2023
bc725b9
Vintergatan
Bobbanz1 Jan 15, 2023
30d4234
Name Change
BetaCentari Jan 15, 2023
86ea887
Merge branch 'plasma-gun-go-THGWOP' of https://github.com/BetaCentari…
BetaCentari Jan 15, 2023
6ee67a3
Testing and trying to bugfix
BetaCentari Jan 15, 2023
23787ac
DAMN IT
Bobbanz1 Jan 15, 2023
96be7da
Merge branch 'plasma-gun-go-THGWOP' of https://github.com/BetaCentari…
Bobbanz1 Jan 15, 2023
27d9761
Forgot the thing making it find the stupid thing
Bobbanz1 Jan 15, 2023
59d8e7f
Map testing, making the gas regulator intake gas
BetaCentari Jan 15, 2023
1caf685
Adds checks for can_fire and after_fire (DOES NOT SHOOT RIGHT NOW)
BetaCentari Jan 15, 2023
319012b
Putting this back, changing later
BetaCentari Jan 15, 2023
a2cf3af
plasma_loader circuitboard, might have fixed issue with piping
Bobbanz1 Jan 16, 2023
f454c76
Plasma variable on Gun now increases
Bobbanz1 Jan 16, 2023
9007a45
Maint State and maintenance/tool shenanigans
BetaCentari Jan 16, 2023
c2e60d8
ZwompZwompBOOOMBOOOMSWEOOOR
Bobbanz1 Jan 16, 2023
05a858d
Merge branch 'plasma-gun-go-THGWOP' of https://github.com/BetaCentari…
Bobbanz1 Jan 16, 2023
58fc08e
Update plasma_gun.dm
BetaCentari Jan 16, 2023
4730d6a
Merge branch 'plasma-gun-go-THGWOP' of https://github.com/BetaCentari…
BetaCentari Jan 16, 2023
3708dc0
Fixes Lights
BetaCentari Jan 16, 2023
76acde8
Safety Button, Weapon Behavior and Range
BetaCentari Jan 16, 2023
6e91918
More appropriate variable names
BetaCentari Jan 16, 2023
563d847
Update fighters_launcher.dm
BetaCentari Jan 16, 2023
e099901
Tracking works, retracking doesn't, multihit works!
BetaCentari Jan 16, 2023
a1806bb
PERFECT TRACKING AND FINDING NEW TARGETS
BetaCentari Jan 17, 2023
49ce3fa
TGUI mostly done, just need feedback
Bobbanz1 Jan 17, 2023
80f9c16
Consistent Lang, New var/
BetaCentari Jan 17, 2023
59bb424
IT IS THE MEEEEERGE CONFLIIICTS
Bobbanz1 Jan 17, 2023
835d5dd
Merge branch 'plasma-gun-go-THGWOP' of https://github.com/BetaCentari…
Bobbanz1 Jan 17, 2023
1ef5eb0
MAC N CHEEEEESE
Bobbanz1 Jan 17, 2023
ccfc43d
OWO what's this?
Bobbanz1 Jan 17, 2023
aac8877
UI Bar for Integrity, safety destabilizing
BetaCentari Jan 17, 2023
230046e
Adds special ammo type, more map testing, research node and sprite
BetaCentari Jan 17, 2023
a36d9ee
Dmi files added
BetaCentari Jan 18, 2023
6bf885c
Fixes tracking after QDEL
BetaCentari Jan 18, 2023
700a033
field integ lower when firing
BetaCentari Jan 18, 2023
35dc3e2
more maint shenanigans and difficulty managing the weapon
BetaCentari Jan 18, 2023
c2dc544
Field integ damage upon misfiring, attempting gas leak
BetaCentari Jan 19, 2023
478dc61
VENT IT ALL
Bobbanz1 Jan 19, 2023
505afde
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Jan 25, 2023
ac6bda0
better walls, Original Gauss
BetaCentari Jan 25, 2023
9145982
Proper dimensions
BetaCentari Jan 27, 2023
eebbc12
Very important commit
BetaCentari Jan 27, 2023
f1f4d37
Fixes the empty space in robotics
BetaCentari Jan 28, 2023
676f772
view screens
BetaCentari Jan 28, 2023
30ca85d
Stops @bluewasabi24 from complaining
BetaCentari Jan 29, 2023
44ca74c
Reverts plush problem
BetaCentari Jan 29, 2023
458ac6c
Update Serendipity1.dmm
BetaCentari Feb 5, 2023
a4613a2
Sprite, Animations, Animation Length
BetaCentari Feb 6, 2023
048ad4d
Sound design, sprites for plasma pump, removing degeneracy
BetaCentari Feb 7, 2023
f15667f
Post explosion effects
BetaCentari Feb 8, 2023
6d908c6
proper projectile timing
BetaCentari Feb 8, 2023
f5f51af
malfunction sound, louder chamber sound
BetaCentari Feb 8, 2023
dee1c0b
Ignores fighters, clearer comments
BetaCentari Feb 8, 2023
2c68367
Trying to make the possible, impossible
BetaCentari Feb 8, 2023
115e408
Better projectile sprites
BetaCentari Feb 8, 2023
377f372
Useless comments, proper time to fire
BetaCentari Feb 8, 2023
22d1caf
Adds cooldown system
BetaCentari Feb 8, 2023
88185e4
overlay shenanigans
BetaCentari Feb 9, 2023
3c8afa5
Lights, Plasma, ACTION!!
BetaCentari Feb 9, 2023
fc6f8cb
Removing testing areas
BetaCentari Feb 9, 2023
f7f2c70
Merge branch 'plasma-gun-go-THGWOP' into DLV-Serendipity
BetaCentari Feb 9, 2023
3afe0fd
Buncha Stuff
BetaCentari Feb 9, 2023
edfaf75
Better item placement
BetaCentari Feb 9, 2023
c986d5e
Fixes linters, adds instruction manual
BetaCentari Feb 9, 2023
4c781b3
Better blind, shorter wait time
BetaCentari Feb 9, 2023
6fe3ab2
Don't deconstruct warning, some number adjusting
BetaCentari Feb 9, 2023
203cbd2
Finally decent volume, map changes
BetaCentari Feb 9, 2023
81614f6
Better instructions
BetaCentari Feb 9, 2023
9446b05
max integ, medium damage to try
BetaCentari Feb 9, 2023
49f2636
Fixed Sprite
BetaCentari Feb 9, 2023
0a7b201
Fixed Sprite States
BetaCentari Feb 9, 2023
3725744
Safety back on if you maintain it
BetaCentari Feb 9, 2023
f2f7131
Sneaky Connector
BetaCentari Feb 9, 2023
eb71369
Tesla Shock during misfire
BetaCentari Feb 9, 2023
c0fb6d7
Dipity Plasma Cans
BetaCentari Feb 10, 2023
cdab02d
Minor adjustments
BetaCentari Feb 10, 2023
7f3d934
language, sprite thematics
BetaCentari Feb 13, 2023
ed1fd2b
Better language consistency
BetaCentari Feb 13, 2023
449889b
Update nsv13/code/__DEFINES/overmap.dm
BetaCentari Feb 17, 2023
6679d5e
Update nsv13/code/game/objects/items/nsv_circuitboards.dm
BetaCentari Feb 17, 2023
49fb373
Update nsv13/code/modules/overmap/weapons/plasma_gun.dm
BetaCentari Feb 17, 2023
7306466
Update nsv13/code/modules/overmap/weapons/plasma_gun.dm
BetaCentari Feb 17, 2023
98640de
Update nsv13/code/modules/research/techweb/all_nsv_nodes.dm
BetaCentari Feb 17, 2023
eb0adce
Lower construction cost
BetaCentari Feb 17, 2023
7620209
Merge branch 'DLV-Serendipity' of https://github.com/BetaCentari/NSV1…
BetaCentari Feb 17, 2023
ac0b46d
Even lower
BetaCentari Feb 17, 2023
6d49ecf
Change the pipe layer
BetaCentari Feb 17, 2023
e638088
Bad at spelling
BetaCentari Feb 17, 2023
93aca79
spaces
BetaCentari Feb 17, 2023
2d2aea7
Indentation
BetaCentari Feb 17, 2023
a02011f
Removing shield gen spawner for now
BetaCentari Feb 17, 2023
cb74e5b
Better spawner stuff
BetaCentari Feb 17, 2023
a3bda76
Proper statistics
BetaCentari Feb 17, 2023
7ec8d9b
Fixes plasmagun
BetaCentari Feb 21, 2023
1d8a97a
Tiny change
BetaCentari Feb 21, 2023
6fbfb37
Update Serendipity1.dmm
BetaCentari Feb 24, 2023
c610162
Stops Kaitlin Moore from demanding skirts
BetaCentari Feb 25, 2023
70858f8
Gloves
BetaCentari Feb 25, 2023
322228c
Requested changes, json compatibility
BetaCentari Feb 25, 2023
323ea6b
NO LAMP
BetaCentari Feb 25, 2023
e866257
Remove homing so homing works?
BetaCentari Feb 25, 2023
401b6ad
Don't scream at me please
BetaCentari Feb 25, 2023
1cc5acb
Removing Event Serendipity
BetaCentari Feb 25, 2023
84a9a57
Requested changes
BetaCentari Feb 25, 2023
d3ddbbb
Merge remote-tracking branch 'upstream/master' into DLV-Serendipity
BetaCentari Mar 1, 2023
f6d6d38
Fixes the Replicator
Bobbanz1 Mar 3, 2023
e595b77
Requested Changes
BetaCentari Mar 10, 2023
3e594f5
Armor values!
BetaCentari Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
78,374 changes: 78,374 additions & 0 deletions _maps/map_files/Instanced/map_files/SerendipityEvent.dmm
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions _maps/map_files/Instanced/serendipityEvent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"map_name": "DLV Serendipity",
"map_path": "map_files/Instanced/map_files",
"map_file": ["SerendipityEvent.dmm"],
"traits": [{"Linkage": "Self", "Boardable Ship": 1}],
"ship_type": "/obj/structure/overmap/nanotrasen/serendipity/event"
}