Commit Graph

4508 Commits

Author SHA1 Message Date
silicons 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
Putnam3145 62fae3515a Merge pull request #13326 from Citadel-Station-13/silicons-patch-29
radioactive ghosts redux
2020-09-04 18:07:34 -07:00
deathride58 1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
silicons aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
Trilbyspaceclone 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons 84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
silicons 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
silicons 5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
silicons 857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
silicons ec9b82381b Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
2020-08-27 09:42:08 -07:00
Trilbyspaceclone c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
timothyteakettle 8d6a026153 yep 2020-08-27 00:01:54 +01:00
silicons 1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
silicons f611fee193 mecha are no longer immune to goliath tentacles (#13172)
* Update goliath.dm

* Update goliath.dm

* Update goliath.dm
2020-08-26 13:06:53 +02:00
timothyteakettle 5cf06be877 cancel on move 2020-08-26 01:09:51 +01:00
timothyteakettle f908475617 rock paper scissors 2020-08-26 01:01:09 +01:00
silicons 9d0fafd09e Update ventcrawling.dm (#13061) 2020-08-25 23:08:34 +02:00
silicons 1608214156 gives vortex blasts 50% armor pen vs mechas (#13171)
* Update hierophant.dm

* Update hierophant.dm

* Update hierophant.dm
2020-08-25 22:17:36 +02:00
silicons 8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
silicons f0bcab1143 Merge pull request #13241 from Putnam3145/voreeject
Made all death release vore contents, not just gibbing/dusting
2020-08-23 17:39:43 -07:00
Putnam 87080bfac4 Made all death release vore contents, not just gibbing/dusting 2020-08-22 17:51:32 -07:00
timothyteakettle b68baf2f25 this is funny 2020-08-23 01:44:33 +01:00
Timothy Teakettle c1a4ad5ea4 non greyscale moths deserve love too 2020-08-22 23:28:03 +01:00
silicons 188bb13272 Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
2020-08-22 15:22:19 -07:00
silicons 68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
2020-08-22 15:19:48 -07:00
silicons 7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
Timothy Teakettle 60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
timothyteakettle 613880b9b0 saves and moths 2020-08-21 23:32:43 +01:00
timothyteakettle a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
Letter N f04918bdca working code? 2020-08-21 15:09:49 +08:00
timothyteakettle 709ddb4e58 test 2020-08-21 03:48:30 +01:00
Timothy Teakettle 88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Timothy Teakettle bc16a8f1b2 fix lizard snouts 2020-08-20 16:39:07 +01:00
Letter N 2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
silicons 48652e4b0a Merge pull request #13202 from tiramisuapimancer/master
Makes Ethereal hair their mutcolor instead of white
2020-08-18 18:53:40 -07:00
silicons 0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07:00
tiramisuapimancer 13609ba6e6 Update ethereal.dm 2020-08-17 23:01:01 -08:00
timothyteakettle d312a5d639 fix tails 2020-08-18 01:32:06 +01:00
timothyteakettle 47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
silicons 7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
Timothy Teakettle f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00