 Archie
|
f4f18f4002
|
Small metastation changes
|
2021-01-14 16:45:12 -03:00 |
|
|
Archie
|
80d37a88ae
|
Fixes ghost role text all around
|
2021-01-10 12:13:31 -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 |
|
|
kevinz000
|
8e51c88d0e
|
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2021-01-02 16:53:52 -03:00 |
|
|
QuoteFox
|
a9575ffc21
|
Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
|
2021-01-02 14:02:24 +00:00 |
|
|
QuoteFox
|
087dae7af1
|
Merge pull request #799 from CapnMachaddish/bluethread
add bluespace thread to syndie asteroid
|
2021-01-02 13:40:37 +00:00 |
|
|
CapnMachaddish
|
3be7e992ba
|
add bspace thread to syndie asteroid
yes
|
2021-01-01 16:05:06 -06:00 |
|
|
DragonTrance
|
76b04095ee
|
adds cryopods in syndicate base
|
2021-01-01 12:19:53 -07: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 |
|
|
Archie
|
48ede22c46
|
Merge remote-tracking branch 'upstream/master' into reagentsagain
|
2020-12-18 01:20:57 -03:00 |
|
|
Archie
|
26f350def2
|
Who even though this was a good idea?
|
2020-12-16 07:13:59 -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
|
838c20c200
|
Merge remote-tracking branch 'upstream/master' into reagentsagain
|
2020-12-09 14:32:55 -03:00 |
|
|
Lin
|
a7c539ac32
|
Ports reagents id removal and typepath usage.
|
2020-12-09 14:32:36 -03: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 |
|
|
Dip
|
ec279335c1
|
eh, why not
|
2020-11-23 18:05:10 -03:00 |
|
|
Dip
|
cb8ae2d083
|
The Unfuckening of the Syndicate Base
|
2020-11-23 17:48:06 -03: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
|
94bbbf189a
|
More teg fixes
|
2020-11-17 23:25:31 -03:00 |
|
|
Dahlular
|
28096ff19b
|
Merge pull request #680 from ArchieBeepBoop/lunar
Lunar Items v0.1
|
2020-11-13 19:15:12 -07:00 |
|
|
Dip
|
eb06a1d6e8
|
a
|
2020-11-13 19:45:48 -03:00 |
|
|
Dip
|
93025cce37
|
whoopsie
|
2020-11-13 19:45:41 -03:00 |
|
|
Dip
|
78b97a1d51
|
lunar altar (temporary)
|
2020-11-13 19:29:03 -03:00 |
|
|
Dip
|
66a0b66479
|
Medical Gar
|
2020-11-11 05:21:44 -03:00 |
|
|
Dip
|
63f87454a1
|
Increasing map size, adding rocks to block mobs from pathing in
|
2020-11-04 16:42:52 -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 |
|
|
Dahlular
|
ee0017721e
|
Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
|
2020-10-29 22:51:07 -06:00 |
|
|
Dahlular
|
2395ba69c9
|
Merge pull request #616 from Kabramen/more-kink-machines
more kink vendors for some ghost romes + better lighting for the hotel pool
|
2020-10-29 10:27:03 -06: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 |
|
|
Kabra_men
|
3c057c6e30
|
more kink vendors for some ghost romes + better lighting for the hotel pool
|
2020-10-24 23:50:07 -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 |
|