shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,121 Commits 5 Branches 0 Tags
6963ad2aaca05f979b22ff2eddf907b29f88fd06
Commit Graph
1219 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 2715fa9953 Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174 
[MIRROR] Halloween race fixes
 2017-10-29 16:05:19 -04:00
Ashe HiggsandCitadelStationBot 284b265a65 Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems 2017-10-29 13:57:10 -05:00
KorPhaeronandCitadelStationBot edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
ArmhulenandCitadelStationBot 9c63e30e2f Ice Spiders now use frost oil instead of toxin (#32080) 
* PARASTENG!!

* just monika
 2017-10-29 11:02:50 -05:00
vuonojenmustaturskaandCitadelStationBot 53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJayandGitHub debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJayandGitHub d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJayandGitHub 180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJayandGitHub 78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00
LetterJayandGitHub e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJayandGitHub c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJayandGitHub 0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJayandGitHub 5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
Jordan BrownandCitadelStationBot fde6a94202 Merge pull request #32112 from KorPhaeron/mummies 
"Mummies" (cloth golems) for Halloween
 2017-10-27 17:33:52 -05:00
Emmett GainesandCitadelStationBot ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJayandGitHub 9599dd94c0 Merge pull request #3634 from deathride58/voreproctovoreverb 
Readds the hook necessary for vore setup
 2017-10-27 03:15:22 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 4ab8e0d8f1 Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987 
[MIRROR] Inlines and optimizes compile_overlays
 2017-10-27 02:44:48 -04:00
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
deathride58 e7c69850a1 Wait shit what am i doing - fixes voreverbs proper 2017-10-26 14:31:55 -04:00
KorPhaeronandCitadelStationBot 9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -05:00
orangesandCitadelStationBot c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO 
May as well shave some yaks
 2017-10-26 05:05:09 -05:00
ShizCalevandCitadelStationBot c016e1e830 Fixes lightgeist spawning 2017-10-25 23:43:20 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
JJRcopandCitadelStationBot b237b8286a heart of darkness revives non-shadow as shadowpeople 2017-10-25 00:13:05 -05:00
deathride58andPoojawa 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
LetterJayandGitHub bb6cbd8528 Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560 
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
 2017-10-24 21:30:11 -04:00
LetterJayandGitHub 3822aa83a3 Update new_player.dm 2017-10-24 19:49:38 -05:00
LetterJayandGitHub 72bd156589 Update new_player.dm 2017-10-24 18:19:49 -05:00
LetterJayandGitHub e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
KorPhaeronandCitadelStationBot 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
LetterJayandGitHub aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan BrownandCitadelStationBot 94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJayandGitHub 6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
LetterJayandGitHub 74580efe35 Merge pull request #3572 from Citadel-Station-13/upstream-merge-31876 
[MIRROR] Makes cleanbots clean up remains
 2017-10-23 17:49:09 -04:00
LetterJayandGitHub dd53de8859 Update mob.dm 2017-10-23 14:15:43 -05:00
LetterJayandGitHub f0a32458bb Update human_defines.dm 2017-10-23 14:15:30 -05:00
LetterJayandGitHub 9436a60b8f Merge pull request #3567 from Michiyamenotehifunana/ears-fix 
Fixes several ears
 2017-10-23 15:07:03 -04:00
LetterJayandGitHub ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981 
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
 2017-10-23 14:48:10 -04:00
LetterJayandGitHub 11bcd573a0 Update mob_defines.dm 2017-10-23 13:17:52 -05:00
ShizCalevandCitadelStationBot 4cc53d68a2 Makes cleanbots clean up remains (#31876) 
* Makes cleanbots clean up remains

* Gooooooooo

* Acid_act
 2017-10-23 08:38:52 -05:00
Jordan BrownandCitadelStationBot c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
Michiyamenotehifunana 9d52443c53 Fixes #2946 
Otusian, wolf, and skunk ears now show up on humans. Cat, Big ears now show up on mammals.
 2017-10-23 19:29:46 +08:00