shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,294 Commits 5 Branches 0 Tags
eef819c1cd995cf374fd2a4fc199351237ea728e
Commit Graph

335 Commits

Author SHA1 Message Date
naltronix
98a9c8933f fixes the table (#32189) 2017-10-29 10:57:34 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
LetterJay
1df0bc16a4 Merge pull request #3608 from Citadel-Station-13/upstream-merge-32082 
[MIRROR] Fixes pipe runtime
 2017-10-26 14:21:07 -04:00
ShizCalev
6316c0d989 Fixes pipe runetime 2017-10-25 23:32:40 -05:00
Leo
6235c66517 Merge pull request #32070 from ShizCalev/delta-vent 
Corrects disabled vent in delta toxins lab.
 2017-10-25 18:55:54 -05:00
deathride58
2fc3636360 FUCK part 3 - fixes gravity generator assmos and also makes nonlethal armory look less like ass while im at it 2017-10-23 18:12:26 -04:00
deathride58
0a3f908a7b FUCK - fixes brig wiring 2017-10-23 17:33:04 -04:00
deathride58
cfb6f98c3c FIXES RWALL YES THIS IS NECESSARY FUCK 2017-10-23 15:58:33 -04:00
deathride58
ec6b7770c9 merges #3577 2017-10-23 15:47:43 -04:00
deathride58
c77421ec4a EMERGENCY BOX CLOWN/MIME OFFICE HOTFIX 2017-10-23 15:36:51 -04:00
deathride58
6ead40bcee Boxstation security changes 2017-10-23 14:43:05 -04:00
deathride58
268c80dc66 fixes areas, other small changes 2017-10-23 14:26:05 -04:00
deathride58
c6150a0819 Boxstation major non-security map changes 2017-10-23 14:10:23 -04:00
deathride58
bc3e8968ab Deltastation + Metastation map changes 2017-10-23 13:41:57 -04:00
deathride58
930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00
LetterJay
2e430ec33c Merge pull request #3488 from Citadel-Station-13/upstream-merge-31814 
[MIRROR] Adds missing petbed on Meta
 2017-10-19 09:02:05 -04:00
ShizCalev
592f6d89f2 Adds missing petbed on Meta 2017-10-18 11:54:56 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
LetterJay
da43e2cd46 Update DeltaStation2.dmm 2017-10-18 06:26:51 -05:00
ShizCalev
df524ddaa6 Fixes mapping issues introduced in #30909 2017-10-17 13:36:08 -05:00
kevinz000
89fbf077d9 Fixes missing semicolon in sargeant araneus vars (#31790) 
* semicolon

* no define
 2017-10-16 22:55:31 -05:00
LetterJay
24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707 
[MIRROR] Restores security bombsuit & white bombsuit
 2017-10-16 14:12:28 -04:00
kevinz000
af5dab8436 fixE (#31740) 2017-10-15 20:56:34 -05:00
Jordan Brown
742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
deathride58
5078783706 adds grilles outside of armory 2017-10-14 22:40:55 -04:00
deathride58
338c0a5696 gives hardsuit a wall to themselves (updating op with updated picture in like 5 seconds) 2017-10-14 22:38:22 -04:00
deathride58
fff2a6b767 makes sec lobby all access, adds extra shutters to courtroom 2017-10-14 22:27:01 -04:00
deathride58
1a04048978 fixes the regular wall tile amongst the reinforced tiles in boxstation cells 2017-10-14 22:04:58 -04:00
deathride58
cbad9c11c0 oof 2017-10-14 18:47:45 -04:00
deathride58
f7ff1c3f63 boxstation tweaks 2017-10-14 18:35:27 -04:00
deathride58
f7194ab920 deltastation and metastation tweaks 2017-10-14 18:31:38 -04:00
LetterJay
dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598 
[MIRROR] Smoke Machine Updates & Fixes
 2017-10-14 10:21:09 -04:00
Robustin
4100473aba Smoke Machine Updates & Fixes (#31598) 
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
 2017-10-13 16:50:32 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
ShizCalev
9f9f06db07 RESTORES THE CHAIN OF COMMAND ON DELTA STATION (#31567) 2017-10-12 12:35:37 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
bawhoppen
0e56051194 Moves Smoke Machine boards to tech storage (#31546) 2017-10-12 00:28:35 -05:00
LetterJay
06bfc02357 Merge pull request #3293 from Citadel-Station-13/upstream-merge-31507 
[MIRROR] Cleans up warning line varedits
 2017-10-10 22:33:06 -04:00
LetterJay
ca521a4ea2 Merge pull request #3291 from Citadel-Station-13/upstream-merge-31506 
[MIRROR] Fixes missing texture on pubbystation
 2017-10-10 22:32:36 -04:00
LetterJay
5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -04:00
Jordan Brown
b1c26daf8b Merge pull request #31507 from ShizCalev/varedit-cleanup 
Cleans up warning line varedits
 2017-10-10 13:29:48 -05:00
Jordan Brown
2234fa95de Merge pull request #31506 from ShizCalev/pubby-texture-fix 
Fixes missing texture on pubbystation
 2017-10-10 13:24:24 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
Leo
8101c5776a Merge pull request #31484 from Bawhoppen/berniesanders 
Removes portable chem dispenser from xenobio
 2017-10-10 07:09:21 -05:00
LetterJay
3082f82ead Merge pull request #3263 from deathride58/readdkinkmates 
Readds kinkmates to delta and meta
 2017-10-09 23:02:46 -04:00
deathride58
5bd04f70d8 Readds kinkmates to delta and meta 2017-10-09 21:59:59 -04:00
deathride58
45ed5812c5 Fixes cameras 2017-10-09 20:48:30 -04:00
deathride58
21820de896 changes arrivals security checkpoint to customs 2017-10-09 15:18:08 -04:00
deathride58
2bbe4bd6e8 MAP MERGER 2017-10-09 14:46:33 -04:00