Commit Graph

5191 Commits

Author SHA1 Message Date
Hatterhat
3c8a4b38c4 harmies 2020-08-29 02:47:46 -05:00
Hatterhat
7ed2a3cbfe update 2020-08-28 20:28:05 -05:00
Hatterhat
5dd09c2402 the one where i make it work 2020-08-28 20:20:19 -05:00
silicons
734ed238b7 Merge pull request #13257 from timothyteakettle/so-ya-like-qol-huh
qol: customization features appear in alphabetical order
2020-08-27 10:03:15 -07: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
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
Timothy Teakettle
be22486913 this hurt to do manually 2020-08-24 19:55:10 +01: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
Hatterhat
5fcf537f57 fuck 2020-08-22 00:34:40 -05:00
Hatterhat
f59e627913 past tense moment 2020-08-21 18:15:06 -05: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
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
Hatterhat
02194633b5 initial commit - za hando 2020-08-20 09:14:30 -05:00
timothyteakettle
b40a42209d fixes two snout paths 2020-08-19 03:19:51 +01: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
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
38959b6120 Merge branch '13141' 2020-08-16 18:46:33 -07:00
silicons
b7b13403b9 Merge branch '13130' 2020-08-16 18:45:54 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons
428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
Lin
2fd3e2dd87 Merge pull request #13092 from Citadel-Station-13/silicons-patch-87
active blocking now also considers a stamina damaging projectile's stamina damage to be .. damage
2020-08-16 20:20:29 -05:00
Putnam
f54d272b11 Yet more dynamic tweaks. 2020-08-15 23:38:21 -07:00
Navier
fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
Detective Google
9b943ec7a9 yee 2020-08-15 21:29:39 -05:00