Archie
f4f18f4002
Small metastation changes
2021-01-14 16:45:12 -03:00
Lin
02da471330
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2021-01-06 15:39:13 -03:00
Chloe Carver-Brown
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
Archie
b2a1a63bb1
Reagent Fix Pack 1
2020-12-24 14:30:43 -03:00
Dahlular
bed13540f7
Merge pull request #756 from TotallyNotADog/xenoarchFixes
...
fixes bar tables, empty medkits, and locked vendors on xenoarch
2020-12-09 21:37:38 -07:00
TotallyNotADog
f4d31df2d5
deja vu, i've made this commit before
2020-12-09 21:19:55 -06:00
TotallyNotADog
3b1dc6ed53
fixes bar tables, empty medkits, and locked vendors
2020-12-09 14:12:10 -06:00
Archie
786b1f4506
Fixing minor issues
2020-12-06 22:25:14 -03:00
Dahlular
b6cbd7c1e8
Merge pull request #740 from Crashtest-LXXXIX/master
...
Omega-station De-rusted
2020-12-06 13:32:27 -07:00
Crashtest-LXXXIX
de6a5e158f
Add files via upload
2020-12-04 23:52:24 +00:00
Crashtest-LXXXIX
7bf0ef7dea
Delete OmegaStation.dmm
2020-12-04 23:49:46 +00:00
Chloe
8639041f8d
Adding 2 Snowflake Drone Shells to roundstart AI Sat
...
Does what it says on the box, adds 2 Snowflake Drone Shells to Box and Pubby, they are located in the foyer of the AI satalite.
2020-12-03 00:46:39 +00:00
Dahlular
8b6ce3528e
Merge pull request #720 from CapnMachaddish/ARGH-NOT-AGAIN
...
Fixes the Labor Camp Teleporter Console
2020-12-01 20:16:01 -07:00
Dahlular
8e53088452
Merge pull request #614 from ArchieBeepBoop/syndieboxstation
...
Special Box Station - Syndie Station
2020-12-01 20:13:03 -07:00
CapnMachaddish
54c1e31972
ARGH NOT AGAIN
...
gulag telethingy goes fucky again ree
2020-11-25 16:23:58 -06:00
Dahlular
fa5e05c44c
Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
...
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
Dahlular
8ba63c880e
Merge pull request #696 from DragonTrance/doors-dude
...
Metastation Door fixes & stuff
2020-11-21 22:55:34 -07:00
kevinz000
14b3fa22ce
Merge pull request #9404 from Poojawa/qm-is-a-head
...
QM is a head of staff, Cargo ID Console added
2020-11-20 20:12:42 -03:00
DragonTrance
357a69667b
screhh
2020-11-19 12:36:15 -07:00
DragonTrance
bd9bfea21c
oops, accidentally deleted a pipe
2020-11-19 12:26:45 -07:00
DragonTrance
eb768a91e3
metastation fix
...
fixes doors & misc things
2020-11-19 12:14:23 -07:00
Dip
66a0b66479
Medical Gar
2020-11-11 05:21:44 -03:00
kevinz000
b9822c235a
Merge pull request #9234 from Trilbyspaceclone/reebee_redone
...
[WIP] [TEST-MERGE] Makes clock work reebe less laggy + addtions
2020-11-02 17:36:43 -03:00
Ghom
28cdb9c5f1
Oh no.
2020-10-30 05:30:15 -03:00
Dip
68665d2006
we're crashing the server with no survivors
2020-10-28 17:09:46 -03:00
kevinz000
fa655a1b78
Merge pull request #9456 from Thalpy/Spookytime
...
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
Dip
84c8e0b5c9
Lia for Pubby
2020-10-24 17:40:33 -03:00
Dip
febbd3bff4
Adds Lia to the HoS office
2020-10-24 17:35:14 -03:00
Dip
46c385452c
reinforced wall fix
2020-10-24 17:30:44 -03:00
Dip
f30153e7b1
syndieboxstation
2020-10-19 19:04:28 -03:00
Dip
ab5c9fb77b
adds bloodbank generators to active maps
2020-10-18 00:14:54 -03:00
CapnMachaddish
92dd91d37b
aaaaaaa
...
aaaaaaaa
2020-10-15 20:22:27 -05:00
CapnMachaddish
8f6f08b1f9
fixed telecomm wiring
...
Exactly what it says on the tin
2020-10-15 20:01:37 -05:00
Lin
e0d9a3b354
Merge pull request #10160 from Ghommie/Ghommie-cit453
...
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
Dip
739b072a1e
Done
2020-10-12 21:10:55 -03:00
Dip
ee2bc9ac17
a
2020-10-12 21:09:31 -03:00
Dip
e08575067a
revert metastation
2020-10-12 21:09:25 -03:00
Dip
fe9c29ac3f
revert pubby
2020-10-12 21:07:44 -03:00
kevinz000
533a39d199
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2020-10-12 21:01:54 -03:00
QuoteFox
8802cef599
Merge pull request #581 from KathrinBailey/Tile-Floofing
...
Fixes roundstart errors: build_pipeline(), incendiary shells missing sprites, tiles with no airmix in the bar & down to 0 atmos differences at roundstart
2020-10-12 15:34:22 +01:00
KathrinBailey
7d1cab2cd8
more atmos differences
2020-10-11 18:17:13 +01:00
KathrinBailey
24d8e5bd2e
Roundstart atmos differences
...
Saves probably 0.2s every round
2020-10-11 17:41:08 +01:00
KathrinBailey
7311ca0f54
Fixes build_pipeline() errors, some uneccessary roundstart atmos differences and missing icon_state for incendiary 12G rounds.
2020-10-11 08:36:56 +01:00
ToonClyde
ba4c38cbc4
The Suite Life of Winfre & Marie
2020-10-08 14:58:40 -07:00
ToonClyde
5af0db905f
Pubby station now have pool!!
2020-10-07 23:28:43 -07:00
ToonClyde
55ef96c076
Pool redesign and some other bug fixes
2020-10-07 21:09:00 -07:00
Ghom
779cc787a3
Merge pull request #10541 from Detective-Google/the-p-o-o-l
...
adds the POOL
2020-10-07 18:40:10 -03:00
ToonClyde
580a84900a
Windoors for Cargo flaps
2020-10-01 15:54:41 -07:00
QuoteFox
e03ea419b7
Merge pull request #523 from ArchieBeepBoop/randomness
...
We don't need no safety protocols - Merges Random Engines
2020-09-28 22:29:21 +01:00
ToonClyde
04cbcaa1d8
Pubby firing range
2020-09-27 16:59:14 -07:00