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
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
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
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
Lin
2fa0b4ae6c
Merge pull request #13105 from silicons/underwear_412
...
ports binder bras from rp
2020-08-14 13:03:25 -05:00
Lin
cd89785bc9
Merge pull request #13131 from Citadel-Station-13/silicons-patch-6
...
gives ethereals underwear
2020-08-14 13:02:18 -05:00
kiwedespars
bff11c4fe5
fixes, changes.
...
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648 )
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629 )
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
MrJWhit
20a9451b56
Update lizardpeople.dm
2020-08-12 21:35:36 -04:00
silicons
d2773456f0
Update mob.dm
2020-08-12 08:33:06 -07:00
silicons
569cef0e42
Update ethereal.dm
2020-08-11 17:05:32 -07:00
timothyteakettle
2a6490b60c
yes
2020-08-12 00:47:06 +01:00
timothyteakettle
cd8430a897
woops
2020-08-12 00:42:51 +01:00
timothyteakettle
a2721b1ccd
traits
2020-08-12 00:40:49 +01:00
silicons
130c3a9480
Merge pull request #13096 from Michiyamenotehifunana/possum
...
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
Timothy Teakettle
45dae759df
all the homies hate travis
2020-08-11 21:04:29 +01:00
Timothy Teakettle
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
silicons
b16f920479
Merge pull request #13086 from ArchieBeepBoop/dev
...
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
silicons
df05c5ee4d
Merge pull request #13089 from Putnam3145/fix-sprite-display
...
Demodularization + making certain sprite overlays less hilariously jank
2020-08-11 01:43:21 -07:00
silicons
23b235d6ed
Update living_active_block.dm
2020-08-11 01:42:42 -07:00
silicons
035422ed7f
Merge pull request #13098 from LetterN/ToS-component
...
Mafia Component
2020-08-11 01:41:13 -07:00
kiwedespars
3bd2f73449
travis
2020-08-10 21:37:50 -07:00
kiwedespars
036c7dbe39
Merge remote-tracking branch 'upstream/master' into heretics
2020-08-10 21:05:56 -07:00
timothyteakettle
b9efa05ec4
double FUCK
2020-08-11 03:40:41 +01:00
timothyteakettle
84a8585055
FUCK
2020-08-11 03:38:25 +01:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
