shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,191 Commits 5 Branches 0 Tags
ceda48865d3ebf21e7070f5902da8cb4e410dff3
Commit Graph
522 Commits
Author SHA1 Message Date
checkraisefoldandCitadelStationBot e3036f6eae fix 'cannot scream while unconscious' bug (#32814) 
* fix 'cannot scream while unconscious' bug 

fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)

* Update species.dm

* sanitize code

* add the comment back so people know what it doin

* change operator

other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
 2017-11-18 13:52:36 -06:00
deathride58andGitHub d202867730 Update carbon.dm 2017-11-17 23:23:13 -05:00
deathride58andGitHub f1818eb11b Update death.dm 2017-11-17 23:22:02 -05:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJayandGitHub 286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJayandGitHub 2715fd1b6c Merge pull request #3950 from deathride58/slimernosliming 
Re-disables slimeperson splitting
 2017-11-15 10:54:51 -06:00
LetterJayandGitHub 163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702 
[MIRROR] Minor speedups to movement: First Blood Part 2
 2017-11-15 10:41:16 -06:00
LetterJayandGitHub 3c28ea5426 Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277 
[MIRROR] Removes golem debug code that spams world
 2017-11-15 10:30:31 -06:00
LetterJayandGitHub 1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
deathride58 f1274b41f2 redisables slime splitting 2017-11-14 19:27:19 -05:00
vuonojenmustaturskaandCitadelStationBot 8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
RobustinandCitadelStationBot 2fc1e5c8e5 More nuanced damage examination (#32707) 
* More nuanced damage examinations

* Tweaking examination values

* Redundancy Removal
 2017-11-14 13:48:20 -06:00
LetterJayandGitHub d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
LetterJayandGitHub f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub e97bc1028e Update examine.dm 2017-11-12 14:09:20 -06:00
LetterJayandGitHub 8d78a999e1 Update jellypeople.dm 2017-11-12 13:17:41 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
MoreRobustThanYouandCitadelStationBot 1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00
AnturKandCitadelStationBot 2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
LetterJayandGitHub 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
ArmhulenandCitadelStationBot 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
KorPhaeronandCitadelStationBot 8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
nicbnandCitadelStationBot 8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
LetterJayandGitHub 528c7e7837 Merge branch 'master' into upstream-merge-32277 2017-10-31 03:09:38 -04:00
LetterJayandGitHub 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
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 49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJayandGitHub 8dfcac7056 Update golems.dm 2017-10-30 20:35:35 -05:00
LetterJayandGitHub ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
orangesandCitadelStationBot 94cad81cf6 Removes golem debug code that spams world 2017-10-30 18:22:01 -05:00
kevinz000andCitadelStationBot 93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
LetterJayandGitHub 48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05: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
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -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 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
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
KorPhaeronandCitadelStationBot 9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -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