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

13348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
ef1ffa5ac0 Automatic changelog generation for PR #5362 [ci skip] 2018-02-08 00:30:33 -06:00
LetterJay
c8b7e5dc7a Merge pull request #5362 from Michiyamenotehifunana/nekomimi-port 
Ports TG's nekomimi to Cit's mammal sprite accessories system
 2018-02-08 00:30:31 -06:00
CitadelStationBot
5b59c73071 Automatic changelog generation for PR #5361 [ci skip] 2018-02-08 00:30:15 -06:00
LetterJay
76702c61e7 Merge pull request #5361 from deathride58/nightlightfix 
Fixes night lighting not going into effect properly at the start of the round
 2018-02-08 00:30:13 -06:00
Michiyamenotehifunana
ca8a8e12bf Ports TG nekomimi to Cit's mammal sprite accessories system 2018-02-08 12:59:01 +08:00
CitadelStationBot
d5bfa7afca Automatic changelog generation for PR #5360 [ci skip] 2018-02-07 21:30:43 -06:00
deathride58
47bf1e37a7 Merge pull request #5360 from Citadel-Station-13/upstream-merge-35168 
[MIRROR] adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free
 2018-02-08 03:30:41 +00:00
deathride58
2e255f3b8b fixes nightlights not dimming properly at the start of the round 2018-02-07 22:27:29 -05:00
CitadelStationBot
3261fc08cf adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free 2018-02-07 20:23:32 -06:00
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
CitadelStationBot
b476df25ca Automatic changelog generation for PR #5357 [ci skip] 2018-02-07 14:52:12 -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
CitadelStationBot
a9bdf1a39a Automatic changelog generation for PR #5348 [ci skip] 2018-02-07 14:51:58 -06:00
deathride58
ae03e3daa4 Merge pull request #5348 from Citadel-Station-13/upstream-merge-35194 
[MIRROR] Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates
 2018-02-07 20:51:55 +00:00
CitadelStationBot
ab76faa255 Automatic changelog generation for PR #5339 [ci skip] 2018-02-07 14:51:42 -06: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
b8f9807e39 Merge pull request #5358 from Citadel-Station-13/upstream-merge-35395 
[MIRROR] Fixes callbacks and invoke time args failing when pushUsr was used
 2018-02-07 19:12:35 +00:00
deathride58
a3f3e50f0a Merge pull request #5356 from Citadel-Station-13/upstream-merge-35386 
[MIRROR] balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess)
 2018-02-07 19:12:13 +00: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
CitadelStationBot
ce775d2d88 Automatic changelog generation for PR #5354 [ci skip] 2018-02-07 13:11:34 -06: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
CitadelStationBot
f6eeaf798f Automatic changelog generation for PR #5353 [ci skip] 2018-02-07 13:11:16 -06:00
deathride58
9c1effc0ff Merge pull request #5353 from Citadel-Station-13/upstream-merge-35258 
[MIRROR] Explosive holoparasites must now be adjacent to turn objects into bombs
 2018-02-07 19:11:14 +00:00
CitadelStationBot
010bebb4e6 Automatic changelog generation for PR #5351 [ci skip] 2018-02-07 13:10:39 -06: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
CitadelStationBot
617175fdc8 Automatic changelog generation for PR #5350 [ci skip] 2018-02-07 13:10:13 -06:00
deathride58
f8a9899df4 Merge pull request #5350 from Citadel-Station-13/upstream-merge-35381 
[MIRROR] Prevents fungal TB spores from being synthesized
 2018-02-07 19:10:10 +00:00
CitadelStationBot
bd9b7f3779 Automatic changelog generation for PR #5349 [ci skip] 2018-02-07 13:09:55 -06:00
deathride58
e7fa382cd4 Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374 
[MIRROR] Fix pressure damage not taking effect properly
 2018-02-07 19:09:52 +00:00
deathride58
be212dd736 Update packs.dm 2018-02-07 14:09:28 -05:00
CitadelStationBot
9865fec9f8 Automatic changelog generation for PR #5347 [ci skip] 2018-02-07 13:08:29 -06: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
CitadelStationBot
778ff7889a Automatic changelog generation for PR #5346 [ci skip] 2018-02-07 13:08:11 -06:00
deathride58
41bacce125 Merge pull request #5346 from Citadel-Station-13/upstream-merge-35356 
[MIRROR] Makes the posibrain play a ping sound on success.
 2018-02-07 19:08:09 +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
CitadelStationBot
3da6459362 Automatic changelog generation for PR #5344 [ci skip] 2018-02-07 13:07:41 -06: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
CitadelStationBot
df02631dc4 Automatic changelog generation for PR #5343 [ci skip] 2018-02-07 13:07:26 -06:00
deathride58
1e0155d1c8 Merge pull request #5343 from Citadel-Station-13/upstream-merge-35353 
[MIRROR] Reduced shards and shells for the cult
 2018-02-07 19:07:24 +00:00
CitadelStationBot
e63c61ab59 Automatic changelog generation for PR #5342 [ci skip] 2018-02-07 13:07:04 -06:00
deathride58
2732823a68 Merge pull request #5342 from Citadel-Station-13/upstream-merge-35277 
[MIRROR] Forces gases to obey certain laws of nature
 2018-02-07 19:07:01 +00:00
deathride58
65a470611d Merge pull request #5341 from Citadel-Station-13/upstream-merge-35361 
[MIRROR] Re-enables space runes on Station Z-Level
 2018-02-07 19:06:12 +00:00
deathride58
3819e8088b Merge pull request #5340 from Citadel-Station-13/upstream-merge-35212 
[MIRROR] Squashes silicon HUDs together
 2018-02-07 19:05:56 +00:00
deathride58
21d5781e37 Update arcade.dm 2018-02-07 14:05:34 -05:00
CitadelStationBot
354ed583f2 Fixes callbacks and invoke time args failing when pushUsr was used 2018-02-07 12:38:36 -06:00
Kyle Spier-Swenson
07e10c38e1 Fixes callbacks and invoke time args failing when pushUsr was used (#35395) 
* Fixes callbacks and invoke time args failing when pushUsr was used

* y u do dis byond
 2018-02-07 12:38:36 -06:00