shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,342 Commits 5 Branches 0 Tags
d5bfa7afcaaee3b51ed8bdeb774b16b42a5ff3eb
Commit Graph

3296 Commits

Author SHA1 Message Date
MMMiracles 2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168) 
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
 2018-02-07 20:23:32 -06:00
CitadelStationBot 717da969a6 [MIRROR] Var cleanup and map fixes (#5359) 
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
 2018-02-07 20:04:04 -06:00
deathride58 b1ea2773fd Merge pull request #5357 from Citadel-Station-13/upstream-merge-35383 
[MIRROR] Changes doppler array point formula
 2018-02-07 20:52:09 +00:00
deathride58 bfce0e4885 Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352 
[MIRROR] Toy Daggers!
 2018-02-07 20:51:39 +00:00
deathride58 7295e9ba82 Update doppler_array.dm 2018-02-07 14:14:53 -05:00
deathride58 e2a6e36ae5 Merge branch 'master' into upstream-merge-35383 2018-02-07 19:13:41 +00:00
deathride58 0d7d8095bb Update doppler_array.dm 2018-02-07 14:13:13 -05:00
deathride58 6e469dcf88 Merge pull request #5355 from Citadel-Station-13/upstream-merge-35393 
[MIRROR] blueprint area changes are now logged to the game log
 2018-02-07 19:11:47 +00:00
deathride58 8e439ec317 Merge pull request #5354 from Citadel-Station-13/upstream-merge-35369 
[MIRROR] Adds the saltmine shuttle.
 2018-02-07 19:11:31 +00:00
deathride58 fc74a6a341 Merge pull request #5351 from Citadel-Station-13/upstream-merge-35303 
[MIRROR] Holopictures and more!
 2018-02-07 19:10:37 +00:00
deathride58 830b33da59 Merge pull request #5347 from Citadel-Station-13/upstream-merge-35360 
[MIRROR] Removes synths and androids from magic mirror
 2018-02-07 19:08:27 +00:00
deathride58 7736dddcf6 Merge pull request #5345 from Citadel-Station-13/upstream-merge-35371 
[MIRROR] doppler arrays no longer runtime when processing < 5/10/20 bombs
 2018-02-07 19:07:53 +00:00
deathride58 4600ace2bd Merge pull request #5344 from Citadel-Station-13/upstream-merge-35363 
[MIRROR] Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 19:07:39 +00:00
deathride58 21d5781e37 Update arcade.dm 2018-02-07 14:05:34 -05:00
BordListian 5d70b0e2e3 Changes doppler array point formula 2018-02-07 08:58:48 -06:00
vuonojenmustaturska 13b01b042e Merge pull request #35393 from optimumtact/blueprintlogging 
blueprint area changes are now logged to the game log
 2018-02-07 07:44:54 -06:00
Dax Dupont 0f8b7da2a1 Adds the saltmine shuttle. (#35369) 
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
 2018-02-07 07:17:50 -06:00
Dax Dupont ed18c63441 Holopictures and more! (#35303) 
* Holopictures and more!

* Remiedation
 2018-02-07 05:17:41 -06:00
vuonojenmustaturska ca5f5f6f1f Merge pull request #35360 from Robustin/blackmirror 
Removes synths and androids from magic mirror
 2018-02-07 04:42:01 -06:00
vuonojenmustaturska a93f9509fc Merge pull request #35371 from kevinz000/patch-444 
doppler arrays no longer runtime when processing < 5/10/20 bombs
 2018-02-07 04:39:33 -06:00
vuonojenmustaturska 192e548bb3 Merge pull request #35363 from Xhuis/chair_nerf 
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 04:39:21 -06:00
BordListian 9b910552fd Forces gases to obey certain laws of nature (#35277) 
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
 2018-02-07 02:32:31 -06:00
ShiggyDiggyDo 991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
CitadelStationBot 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBot b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
deathride58 0696c9eac5 Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324 
[MIRROR] Fix defibrillator mount runtiming continously while empty
 2018-02-06 02:48:52 +00:00
deathride58 f593263a9d Merge pull request #5326 from Citadel-Station-13/upstream-merge-35295 
[MIRROR] Fix holorays staying if you switch holopads
 2018-02-06 02:44:45 +00:00
deathride58 3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316 
[MIRROR] Fixes comm message list for non-unique messages.
 2018-02-06 02:44:29 +00:00
deathride58 85b06c800a Merge pull request #5319 from Citadel-Station-13/upstream-merge-35299 
[MIRROR] fixes small grammar issue on arcades
 2018-02-06 02:43:20 +00:00
vuonojenmustaturska a7057f8331 Merge pull request #35324 from AutomaticFrenzy/patch/defibrillator-runtime 
Fix defibrillator mount runtiming continously while empty
 2018-02-05 17:59:24 -06:00
MoreRobustThanYou e3f5654eb7 Fix holorays staying if you switch holopads (#35295) 
* Fix holorays staying if you switch holopads

* Update hologram.dm
 2018-02-05 15:16:39 -06:00
Leo f574bea5d1 Merge pull request #35316 from AnturK/commfix 
Fixes comm message list for non-unique messages.
 2018-02-05 14:37:50 -06:00
deathride58 389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
vuonojenmustaturska 903ab00096 Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar 
fixes small grammar issue on arcades
 2018-02-05 09:11:51 -06:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot 92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291) 
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
 2018-02-05 05:36:09 -06:00
CitadelStationBot 2ab7a45cb9 If the person inside a morgue tray is clonable, they now beep. Loudly. (#5302) 2018-02-05 05:35:44 -06:00
CitadelStationBot 98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBot e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297) 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
 2018-02-05 04:42:13 -06:00
CitadelStationBot 5c16755e58 [MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296) 
* Fixes Vape Pen (e-cig) reagent spam

* Update cigs_lighters.dm
 2018-02-05 04:33:36 -06:00
CitadelStationBot 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295) 
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
 2018-02-05 03:20:09 -06:00
CitadelStationBot 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260) 
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
 2018-02-05 03:00:22 -06:00
CitadelStationBot 32fab09c69 [MIRROR] Remove revenantspawn landmark from code (#5271) 
* Remove revenantspawn landmark from code (#35238)

* Remove revenantspawn landmark from code
 2018-02-05 01:47:16 -06:00
CitadelStationBot b16d2148e4 [MIRROR] Steampunk Watches! (#5293) 
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
 2018-02-05 01:31:16 -06:00
CitadelStationBot 64c43ee5bc Morgue Trays now provide correct light-indication (#5262) 2018-02-05 01:26:36 -06:00
CitadelStationBot 0c74a7eede [MIRROR] Holorays! (#5261) 
* Holorays!

* adding missing .dmi
 2018-02-05 01:10:29 -06:00
CitadelStationBot 584fc7151b [MIRROR] makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#5256) 
* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)

* traps patch

* flags!

* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things
 2018-02-05 00:57:31 -06:00
CitadelStationBot 7c56b53aab [MIRROR] Ports telecoms to Initialize (#5249) 
* Ports telecoms to Initialize

* Update telecomunications.dm
 2018-02-05 00:57:04 -06:00
CitadelStationBot 662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246) 
* Lavaland bomb runtime fix

* Update cleanable.dm
 2018-02-05 00:56:37 -06:00