shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

658 Commits

Author SHA1 Message Date
LetterJay 044c13f607 Update emote.dm 2018-01-28 15:13:12 -06:00
Jordan Brown ca8f80e454 Fixes not being able to stop tail wagging 2018-01-26 03:00:08 -06:00
LetterJay 9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay 50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
MoreRobustThanYou 35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
LetterJay 8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
LetterJay 85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJay 937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769 
[MIRROR] Cleans up unused mob vars
 2018-01-24 13:56:23 -06:00
XDTM 3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
ShizCalev cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Shadowlight213 4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
Leo 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
deathride58 5aad92cf11 Merge pull request #4948 from Citadel-Station-13/upstream-merge-34590 
[MIRROR] Fixes slimepeople not being able to open the bodyswap menu
 2018-01-22 20:29:46 +00:00
LetterJay 8fcef30c56 Update jellypeople.dm 2018-01-22 07:36:43 -06:00
deathride58 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJay 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJay 9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654 
[MIRROR] Actually fixes wag emote runtime
 2018-01-21 11:49:13 -06:00
LetterJay 23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133 
[MIRROR] Temperature Refactor and Fixes
 2018-01-21 11:47:08 -06:00
Robustin e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Jordan Brown b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix 
Actually fixes wag emote runtime
 2018-01-20 14:09:58 -06:00
LetterJay a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
deathride58 4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
Jordan Brown aa5e57e3a6 Fixes slimepeople not being able to open the bodyswap menu 2018-01-19 09:17:31 -06:00
Trevor Serpas 5d2ddd833a Reduce the volume of the death sound on clock work mobs (#34452) 
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
 2018-01-19 08:58:29 -06:00
Robustin 7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -06:00
LetterJay 9adbe08df8 Merge pull request #4923 from Vivinet/xeno-fix 
Temp. Xeno-Hybrid Eye Fix + Normal Leg Addition
 2018-01-19 03:21:14 -06:00
Vivinet 18fa25cc17 Temp. Xeno Eye Fix - Leg Addition 
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
 2018-01-18 18:20:58 -08:00
deathride58 8c743141da Merge pull request #4721 from deathride58/genitalexamine 
Exposed genitals will now add details onto examine text
 2018-01-18 04:56:50 +00:00
LetterJay 59b5956447 Merge pull request #4826 from deathride58/hopefullyfixesshit 
Hopefully fixes human tails/ears not saving, and fixes new/random characters having underwear
 2018-01-16 05:03:05 -06:00
deathride58 927913662d hopefully fixes new characters having underwear and fixes human tails/ears not saving 2018-01-14 15:25:13 -05:00
Poojawa 655067471a Fixes *wag for mammals 
Someone forgot that we have snowflake bodyparts.
 2018-01-14 03:50:26 -06:00
ShizCalev 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Leo bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00
deathride58 ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58 14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187 
[MIRROR] Switches butchering/gib drops to use drop_location
 2018-01-10 19:56:54 +00:00
Leo 88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1 
Fixes weakref runtimes
 2018-01-10 03:12:46 -06:00
Leo 5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
Robustin 34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
deathride58 78df6facb6 fixes flavortext readmores for real this time 2018-01-09 22:59:22 -05:00
deathride58 b3ff238cb8 you can now examine people with exposed genitals to see details 2018-01-08 20:45:08 -05:00
deathride58 6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
deathride58 e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
oranges 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
Iamgoofball 99b299a1eb Implements the Ballmer Peak: Now the bartender can help R&D! (#33979) 
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
 2018-01-07 20:30:57 -06:00
deathride58 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58 1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58 8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
ShizCalev c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00