Commit Graph

77 Commits

Author SHA1 Message Date
deathride58
2f21f16b53 initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT 2017-11-08 17:04:20 -05:00
vuonojenmustaturska
cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406)
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
LetterJay
5113a71cff Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403
[MIRROR] Removes Freon preset gas filters from all maps
2017-11-04 22:54:06 -05:00
LetterJay
cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits
Boxstation Edits: Legless Warden edition
2017-11-04 22:50:58 -05:00
ACCount
b1b69d107b Removes Freon preset gas filters from all maps (#32403) 2017-11-04 14:24:35 -05:00
deathride58
43dcaed39e Blech 2017-11-04 01:18:23 -04:00
deathride58
961991f7e4 github for windows is an amazing git client 2017-11-04 00:56:31 -04:00
deathride58
1c38ebd9e4 tons of map changes to go around 2017-11-04 00:55:56 -04:00
ACCount
a3783943a7 Internal map improvements (#32310)
* Internal map improvements

* More map sheet fixes

* PubbyStation fix

* More map fixes
2017-11-02 01:23:30 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
ShizCalev
6316c0d989 Fixes pipe runetime 2017-10-25 23:32:40 -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
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
930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00
ShizCalev
df524ddaa6 Fixes mapping issues introduced in #30909 2017-10-17 13:36:08 -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
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
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
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
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
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
deathride58
501a09fee3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into furryhippie 2017-10-09 14:42:47 -04:00
LetterJay
8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
deathride58
55d5d8ec20 actually gives grav generator power, removes stray stool in bar, and removes hazard lines from below vault checkpoint 2017-10-08 18:58:31 -04:00
deathride58
c3f8a9da2c adds clown and mime offices, adds abandoned cafe, makes maint bar all access 2017-10-08 17:26:00 -04:00
deathride58
8b23b6993c we furry hippie now 2017-10-08 05:15:30 -04:00
deathride58
280b5f5e6f Adds kinkmates to Metastation and Deltastation (+Box tweaks) (#3214)
* adds kinkmates to deltastation

* added kinkmates to metastation

* hides atmos pipes in maint dorms
2017-10-07 22:52:43 -07:00
deathride58
7e053c280d Box Maint Bar Mk. 3 (#3174)
* readds maint bar + adds maint dorms

* adds extra fancy stuff

* adds lights to maint bar
2017-10-06 11:37:44 -07:00
oranges
ad08855056 Merge pull request #31291 from ShizCalev/shuttle-templates
Cleans up non-timid shuttle templates & some dirty vars
2017-10-05 03:04:22 -05:00
ShizCalev
d98cd745dd Fixes morgue maintenance radstorm protection (#31253)
* Morgue maint area

* Fixed typo
2017-10-03 17:11:57 -05:00