shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,247 Commits 5 Branches 0 Tags
5ef47b8323f0ad6db9acfe2e525c19d98bbc31ed
Commit Graph

1097 Commits

Author SHA1 Message Date
Lin
4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461 
Fixing a boxstation pipenet mapping issue.
 2019-12-19 23:43:16 +00:00
Lin
f38747ed70 Merge pull request #10207 from Ghommie/Ghommie-cit468 
Fixes pubby wall meds being var-edited snowflakes.
 2019-12-19 23:41:36 +00:00
Ghommie
3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
Ghommie
3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
Ghommie
f738e370a4 Fixes pubby wall meds being var-edited snowflakes. 2019-12-16 15:22:50 +01:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
Ghommie
0b879f0f73 Fixing a boxstation pipenet mapping issue. 2019-12-13 16:57:48 +01:00
Ghommie
911685ff0a Fixes raven's shuttle computer not being of the emergency shuttle type. 2019-12-12 23:28:50 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Useroth
5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Ghommie
e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000
b05854ac98 Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf 
Removes Clockie Surgical capabilities
 2019-12-05 22:02:38 -07:00
kevinz000
fbcdc4d330 Merge pull request #9575 from KathrinBailey/Kat'sBoxRework 
Box Beautification & Bar Rework & Issue 9706 Fix
 2019-12-05 21:38:30 -07:00
KathrinBailey
ae729d400b Permabrig broken area fix 
oopsie I forgot because I'm always tired fuck 6am morning shifts.
 2019-11-30 03:25:21 +00:00
KathrinBailey
d73b93d4a7 Addresses Aelita + Gray + Sylvara, fixes cams, detective office & HoP stamp, room names and airlock cyclelink 
Fixes:
• Missing HoP stamp
• Missing Detective handcuffs
• Improper dorms camera names
• Luxury rooms not really mentioned to be luxury
• Missing airlock cyclelink helper on maint south area that was reworked for better EVA spacewalking on the outside.
 2019-11-30 01:30:12 +00:00
KathrinBailey
90009904cf Maaapmeeergeeee? 
I forgot last commit. Hopefully this'll do it.
 2019-11-28 19:35:08 +00:00
Iroquois Pliskin
9a9c63bea3 Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case. 2019-11-26 09:28:40 -05:00
KathrinBailey
c1e3b07b2c Bugfixes 
Fixes incorrect areas
Fixes disconnected air canisters in maint
Adds Persi's sleepers back into perma
Small changes to perma to make it look slightly cleaner. Kink room in perma because it's probably really boring in there.
 2019-11-25 16:11:06 +00:00
KathrinBailey
9ee4acd143 Persi's Sleepers 2019-11-23 16:00:30 +00:00
KathrinBailey
532fab092f Bugfix from testmerge 
Fixes the terrible stupid mistake.
Blood bank generator in medical lathe room on request, it's there on Pubby and heck I suppose it's something for doctors to do.
 2019-11-23 06:41:23 +00:00
Fermi
18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Fermi
ef78757ed8 oops 2019-11-21 02:19:25 +00:00
Fermi
ff7b070fa1 Maps 2019-11-21 02:16:15 +00:00
KathrinBailey
7adf8da43e weh work please no error 
error man bad
 2019-11-17 06:32:33 +00:00
KathrinBailey
51c1642976 yeah there we go self-confidence destroyed misshun accomplished 2019-11-17 06:18:53 +00:00
kevinz000
ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350 
Ports Improved beach away mission and some fluff mapping items.
 2019-11-14 16:36:19 -07:00
kevinz000
d3822378dc Merge pull request #9797 from PersianXerxes/permaVR 
Adds two VR sleepers to all current maps' perma.
 2019-11-14 16:25:22 -07:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
Ghommie
2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Persi
1f2a32b94d Adds two VR sleepers to all current maps' perma. 2019-11-13 00:49:50 -05:00
Ghommie
4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie
19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Ghommie
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
kevinz000
5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292 
Fixing deep space gorilla runtimes, how ape...
 2019-11-03 06:20:06 -07:00
kevinz000
6127593446 Merge pull request #9670 from Ghommie/Ghommie-cit298 
Mapping in arcade dirs.
 2019-11-03 06:17:02 -07:00
Persi
1e911cd5b2 Patches an exploit that allows the crew to shoot the Ark from the Reebe dressing room. 2019-10-30 21:16:49 -04:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
Ghommie
f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
BlackMajor
3ab0e8950e Bet 2019-10-28 18:07:13 +13:00
kevinz000
455a9922ff Merge pull request #9600 from Trilbyspaceclone/patch-233 
Adds two cotten seeds to ash walker home
 2019-10-27 16:09:39 -07:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
Trilbyspaceclone
841f9ae878 Update lavaland_surface_ash_walker1.dmm 2019-10-24 10:05:26 -04:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00