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

8592 Commits

Author SHA1 Message Date
Michiyamenotehifunana
ca8a8e12bf Ports TG nekomimi to Cit's mammal sprite accessories system 2018-02-08 12:59:01 +08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
BordListian
5d70b0e2e3 Changes doppler array point formula 2018-02-07 08:58:48 -06:00
Armhulen
ae5fa73809 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) (#35386) 
* woah totally wacky wazoo

* OH I'M SAYIN IT

* donezo now lets do the rest lol

* commiting this so i can revert back to it when nobody likes my changes past this point

* 🙏

* jesus

* christ

* move'd
 2018-02-07 08:13:45 -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
vuonojenmustaturska
b678bcf8eb Merge pull request #35258 from kevinz000/patch-441 
Explosive holoparasites must now be adjacent to turn objects into bombs
 2018-02-07 05:40:34 -06:00
Dax Dupont
ed18c63441 Holopictures and more! (#35303) 
* Holopictures and more!

* Remiedation
 2018-02-07 05:17:41 -06:00
81Denton
d68cd9fe9a Prevents fungal TB spores from being synthesized (#35381) 
* can_synth 0 for fungal TB

* 0 -> FALSE
 2018-02-07 04:57:58 -06:00
vuonojenmustaturska
9bb3ce1931 Merge pull request #35374 from AutomaticFrenzy/patch/pressure 
Fix pressure damage not taking effect properly
 2018-02-07 04:56:44 -06:00
Ashe Higgs
cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -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
23843241b4 Merge pull request #35356 from DaxDupont/chime 
Makes the posibrain play a ping sound on success.
 2018-02-07 04:41:52 -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
vuonojenmustaturska
5be63dbaab Merge pull request #35353 from Robustin/constructlimit 
Reduced shards and shells for the cult
 2018-02-07 02:32:39 -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
Robustin
6db2219f20 Reverts oysters (#35361) 2018-02-07 02:32:22 -06:00
Slignerd
afcdb771b3 Squashes silicon HUDs together (#35212) 
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
 2018-02-07 02:32:14 -06:00
ShiggyDiggyDo
991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
deathride58
d236b75ca0 adds widescreen pref 2018-02-07 01:42:31 -05:00
Michiyamenotehifunana
389e6de8f5 FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269) 
* FINALLY AFTER 2 MONTHS

WOOOOOOOOOOOOOOO

* Updates all polychromic code

This makes the default argument of all polychromic color input menus the last chosen color.
 2018-02-06 19:08:08 -06:00
Michiyamenotehifunana
6c18b55e67 Fixes the Mk.37F ejecting broken foam dart "casings" (#5336) 
* one pump chump

* 0 and 1 what is their point of intersection?
 2018-02-06 19:07:51 -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