shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,579 Commits 5 Branches 0 Tags
db65ced87da054233cfe6c260d66fe2fadd7bb21
Commit Graph

1033 Commits

Author SHA1 Message Date
LetterJay
787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437 
[MIRROR] Adds an organ storage bag to the syndicate medborg
 2017-11-07 04:46:44 -06:00
Anonmare
9c12ee48e1 Adds an organ storage bag to the syndicate medborg (#32437) 
* Adds an organ storage bag to the syndicate medborg

* Adds the drill and extinguisher
 2017-11-06 15:15:10 -06:00
MoreRobustThanYou
1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00
LetterJay
39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354 
[MIRROR] Woody golems get woody names.
 2017-11-04 22:47:34 -05:00
LetterJay
dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346 
[MIRROR] removes lesser drake crusher loot
 2017-11-04 22:45:17 -05:00
Armhulen
056594114f Woody golems get woody names. (#32354) 
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
 2017-11-03 17:01:24 -05:00
imsxz
a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284 
[MIRROR] Fix a few syntactic aberrations
 2017-11-03 00:13:00 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
MoreRobustThanYou
41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303) 
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
 2017-11-02 04:13:18 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
oranges
486982b422 Merge pull request #32145 from PKPenguin321/patch-16 
Fixes a camera issue with scout holoparasites
 2017-10-31 15:32:04 -05:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118 
[MIRROR] actually fixes not being able to stop wagging your tail this time
 2017-10-31 03:03:58 -04:00
LetterJay
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123 
[MIRROR] Removes statues from the gold slime pool
 2017-10-31 03:01:34 -04:00
LetterJay
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214 
[MIRROR] Fixes old simple animal humanoid issues
 2017-10-30 22:14:32 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041 
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
 2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
kevinz000
93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
jughu
b6fea33316 Removes statues from the gold slime pool (#32123) 
* Update statue.dm

* Update statue.dm
 2017-10-30 14:53:56 -05:00
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214) 
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
 2017-10-30 06:50:04 -05:00
LetterJay
48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05:00
LetterJay
715a2fb918 Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080 
[MIRROR] Ice Spiders now use frost oil instead of toxin
 2017-10-29 23:37:58 -04:00
Ashe Higgs
284b265a65 Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems 2017-10-29 13:57:10 -05:00
KorPhaeron
edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
Armhulen
9c63e30e2f Ice Spiders now use frost oil instead of toxin (#32080) 
* PARASTENG!!

* just monika
 2017-10-29 11:02:50 -05:00
LetterJay
077e2a1598 Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112 
[MIRROR] "Mummies" (cloth golems) for Halloween
 2017-10-29 04:20:28 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJay
180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJay
c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay
5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
Jordan Brown
fde6a94202 Merge pull request #32112 from KorPhaeron/mummies 
"Mummies" (cloth golems) for Halloween
 2017-10-27 17:33:52 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791 
[MIRROR] Assmos part 1, #2
 2017-10-27 02:47:56 -04:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
KorPhaeron
9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -05:00
ShizCalev
c016e1e830 Fixes lightgeist spawning 2017-10-25 23:43:20 -05:00
CitadelStationBot
7ee7942aa4 [MIRROR] [s] Fixes changling golem exploit (#3600) 
* Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix

Fixes changling golem exploit

* [s] Fixes changling golem exploit
 2017-10-25 20:01:52 -05:00
CitadelStationBot
7ad3afa3c0 [MIRROR] Footprints no longer contain stupid amounts of blood (#3602) 
* Footprints no longer contain stupid amounts of blood (#32056)

* Footprints no longer contain stupid amounts of blood
 2017-10-25 20:01:31 -05:00
JJRcop
b237b8286a heart of darkness revives non-shadow as shadowpeople 2017-10-25 00:13:05 -05:00
deathride58
a664384e81 Bhijn's touching dogborg balance again everyone panic (#3432) 
* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
 2017-10-24 22:04:51 -05:00
KorPhaeron
514533ddaf Ratvar summoning now ends the round/triggers mass proselytize (#31956) 
* Slight changes to ratvar ending

* Tick check

* T

* Why Xhuis?

* Lots of fire

* That src made sense 10 minutes ago but no longer

* More commits than line changes

* Check Tick
 2017-10-24 18:07:06 -05:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00