Rykka
1252ba8482
Fixes it because polaris is silly
2019-09-21 01:15:47 -06:00
Rykka
2c694dbf62
Removes // start // end lasertag bits
2019-09-21 01:07:10 -06:00
Rykka
9dc5e6a44d
Adds VOREStation Edit, pending Polaris port from buttlynx later.
2019-09-21 01:05:26 -06:00
Rykka
a4cb2a1449
Remove the "Lethal" setting from lasertag turrets
2019-09-21 00:57:49 -06:00
Rykka
42007762a0
Adds comment defining start of lasertag turret code
2019-09-21 00:23:02 -06:00
Rykka
974b324638
Merge remote-tracking branch 'Virgo_Master/master'
2019-09-20 23:39:58 -06:00
Novacat
d893ad9ef2
Merge pull request #5925 from Heroman3003/mapfix
...
Little map fixes
2019-09-21 01:09:50 -04:00
Heroman
3fffdbbe93
Fixes vents/scrubbers in the xenobio
2019-09-21 14:59:10 +10:00
Heroman
cbd4e6101d
Little map fixes
2019-09-21 14:52:06 +10:00
Novacat
0e9c0d0776
Merge pull request #5924 from Heroman3003/supply-balance
...
Brings amount of supplies in xenobio to pre-remap levels
2019-09-20 23:58:01 -04:00
Heroman
48f46244cf
Brings amount of supplies in xenobio to pre-remap levels
2019-09-21 13:39:06 +10:00
Novacat
2d1a621fee
Merge pull request #5923 from Mewchild/MC-Xenobio
...
Tweaks several things in new Xenobio
2019-09-20 20:45:13 -04:00
Mewchild
5c00439831
Tweas several things in new Xenobio
2019-09-20 19:30:15 -05:00
Rykka
bfb50d9fb0
Merge remote-tracking branch 'Virgo_Master/master'
2019-09-20 17:43:29 -06:00
Novacat
81c42f2d00
Merge pull request #5922 from Novacat/nova-basicfixes
...
Small Map Tweaks
2019-09-20 19:34:01 -04:00
Unknown
e7091b8c95
Small Map Tweaks
...
- Fixes orientation of gateway shutters
- Fixes orientation of HAP Blast Doors
- Reduces Medical starting Nanopaste to 1 (Same as old Medbay)
2019-09-20 19:23:47 -04:00
Novacat
2576278283
Merge pull request #5921 from Heroman3003/secondary-bridge
...
Adds Secondary Command Office
2019-09-20 18:33:10 -04:00
Heroman
a4e48c7c18
Applies requested changes
2019-09-21 08:23:29 +10:00
Novacat
16be0c3029
Merge pull request #5920 from Novacat/nova-basicfixes
...
Removes underscores
2019-09-20 17:59:49 -04:00
Heroman
bc9aef4c18
Adds Secondary Command Office
2019-09-21 07:57:13 +10:00
Unknown
bf7be873c9
Removes underscores
...
Should fix Resh's and Saveloy's fluff items? Maybe?
2019-09-20 17:48:14 -04:00
Novacat
311abbaefb
Merge pull request #5896 from Novacat/nova-branchfix
...
Moves Planet definition to code
2019-09-20 16:39:53 -04:00
Novacat
a212bbe9ec
Merge pull request #5890 from Mewchild/MC-Midpoint
...
Remakes the entire tether midpoint
2019-09-20 16:39:14 -04:00
Novacat
cfe94c7378
Merge pull request #5736 from Rykka-Stormheart/shep-dev-xenobiology
...
Xenobiology Lab Rework - No longer WIP!
2019-09-20 16:38:53 -04:00
Novacat
5d67a5aa21
Merge pull request #5919 from Heroman3003/decal-light-fix
...
Fixes some decals and missing lightswitches in medical
2019-09-20 13:59:36 -04:00
Heroman
7ce1912b1f
Fixes some decals and missing lightswitches in medical
2019-09-21 03:48:56 +10:00
Novacat
ed7e570bab
Merge pull request #5918 from Novacat/nova-basicfixes
...
Gives basic hostile AI to Russians/Pirates
2019-09-20 13:46:59 -04:00
Unknown
228640a48a
...I should probably make sure it loads
2019-09-20 13:33:41 -04:00
Unknown
469047eb7c
Gives basic hostile AI to Russians/Pirates
2019-09-20 13:30:59 -04:00
Novacat
d095d36e01
Merge pull request #5886 from Heroman3003/cell_loaded
...
Cell-Loaded Weapons reworks and implementations
2019-09-20 12:12:57 -04:00
Novacat
eee66a7ae2
Merge pull request #5912 from Rykka-Stormheart/shep-dev-waiter
...
Adds Server alt-title of Intern
2019-09-20 12:12:39 -04:00
Novacat
9f784dbd60
Merge pull request #5910 from Heroman3003/fushi
...
Makes sushi require fish meat
2019-09-20 12:12:29 -04:00
Novacat
7a43b97988
Merge pull request #5902 from Novacat/nova-weapons
...
Ports pan-slavic from Baystation
2019-09-20 12:12:13 -04:00
Novacat
8dfae6dbdf
Merge pull request #5900 from Novacat/nova-basicfixes
...
Severely nerfs number of ions
2019-09-20 12:12:01 -04:00
Novacat
bed2b14f1c
Merge pull request #5898 from Heroman3003/nanonerf
...
Nerfs regular nanopaste, adds advanced one
2019-09-20 12:10:32 -04:00
Novacat
c4d9c89535
Merge pull request #5913 from Heroman3003/earlyports
...
Earlyports fixes to sandstone and adminwall
2019-09-20 00:11:36 -04:00
Novacat
fb550da5a2
Merge pull request #5915 from Novacat/nova-shuttle
...
Port of #5914
2019-09-20 00:08:11 -04:00
Unknown
992395bf2e
Updates fileList.txt
2019-09-19 23:59:07 -04:00
Unknown
93b86d25f6
Port of #5914
...
Fixes all the wierd filediffs.
2019-09-19 23:56:25 -04:00
Novacat
22d2d66c1f
Update _beach.dm
2019-09-19 23:47:07 -04:00
Heroman
f315f07205
Earlyports fixes to sandstone and adminwall
2019-09-20 13:27:58 +10:00
Rykka
f3654d1b79
Amends name of outfits
2019-09-19 20:58:10 -06:00
Rykka
c9e6a417f3
Adds Waiter/Waitress
2019-09-19 20:45:13 -06:00
Heroman3003
ac3f9ea671
Makes threshold be based on specific organ rather than straight 10
2019-09-20 12:42:38 +10:00
Heroman
d82c986d0a
Makes sushi require fish meat
2019-09-20 05:59:16 +10:00
Novacat
cee087bda9
Merge pull request #5908 from Little-119/medbay-disposals
...
Fixes the broken disposal bin in the morgue, adds some more disposal bins to the medbay
2019-09-19 10:51:48 -04:00
Novacat
dfd9199d17
Merge pull request #5909 from VOREStation/Verkister-patch-7
...
Fixes mouse nutrition runtime spam.
2019-09-19 10:51:20 -04:00
Verkister
634bdcd3a5
Fixes mouse nutrition runtime spam.
...
No more dividing by zero every life tick while also letting the mice have a mouse-appropriate non-powergamey amount of nutrition to drain. (ps. it's not "infinite food", the bellymode is called "drain" for a reason)
2019-09-19 17:24:59 +03:00
Little-119
5be6d9399b
Adds additional disposal bins to the medbay
2019-09-19 08:15:18 -04:00
Little-119
1278d03fbe
Fix unconnected disposal bin in the morgue
2019-09-19 07:41:24 -04:00
