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
Qbopper
048c31c6a2
moved the goddamn locker ( #31144 )
2017-10-01 00:20:38 -05:00
oranges
1a9d36b3f1
Merge pull request #31078 from pubby/opspawn
...
Cleanup operative landmarks
2017-09-28 21:48:11 -05:00
Jordan Brown
0dd54affc4
Merge pull request #30995 from ShizCalev/map-fixes
...
Map fixes
2017-09-25 09:05:54 -05:00
CitadelStationBot
83ec9b6d26
[MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references ( #2768 )
...
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698 )
* Cleans up showcase varedits
* drop_location for oldpods
* Plaques + more loyalty implant references
* Cleans up showcase & plaque varedits, updated loyalty implant references
2017-09-17 23:07:05 -05:00
CitadelStationBot
c8b153ee71
[MIRROR] Varedit cleanup mk4 ( #2833 )
...
* Varedit cleanup mk4 (#30794 )
* Cleans up and corrects a bunch of varedits
* Plant varedits
* More layers
* Adjusted plant name/description
* Varedit cleanup mk4
2017-09-17 22:31:30 -05:00
CitadelStationBot
1db4249fa1
[MIRROR] Adds Abandoned Airlocks ( #2784 )
...
* Adds Abandoned Airlocks (#30705 )
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Abandoned Airlocks
* Added to maps
* inclusive numbering
* Update airlock.dm
* Tweaks
* Capital ChangeTurf
* Update airlock.dm
* no more update_icons
* Abandoned paths (#4 )
* Abandoned paths
* Cleaned up dirty var
* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
CitadelStationBot
82d0aae420
[MIRROR] Changes shuttle port direction var from an angle to a dir ( #2613 )
...
* Changes shuttle port direction var from an angle to a dir
* actually ports the directions
* Update shuttle.dm
* how
2017-09-13 20:39:55 -05:00
Poojawa
8406baebbe
Makes APC cell_type actually pick a cell ( #2747 )
...
* Ports TG#30327
* Update apc.dm
* maybe delta can be fully copies over, yes?
2017-09-13 19:57:21 -05:00
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
1291b12273
Cleaned up stacked pipes
2017-08-13 01:28:11 -05:00
CitadelStationBot
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
LetterJay
70a5aed428
Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
...
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
CitadelStationBot
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
CitadelStationBot
0ce34e08b6
Augment Styles/Changes
2017-07-18 06:45:44 -05:00
CitadelStationBot
755de4f223
Made cell / holding cell windoors their own subtype
2017-07-17 06:52:17 -05:00
CitadelStationBot
ce82313f30
Alters Meta's robo resources to an amount closer to Box's ( #1966 )
2017-07-10 16:13:27 -07:00