Commit Graph

4832 Commits

Author SHA1 Message Date
Letter N 51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons 1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
DeltaFire 999b4c403b Merge pull request #13883 from silicons/temporary_flavortext
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
2020-12-28 17:53:32 +01:00
DeltaFire 3a7cda80b7 Merge pull request #13838 from Citadel-Station-13/silicons-patch-32
removes deathgasping on death if already faking death as it's real easy to spot changelings in stasis otherwise
2020-12-28 16:57:11 +01:00
silicons e8fea4cf1b Update human_defines.dm 2020-12-28 00:19:35 -07:00
silicons 67d9e79934 fix 2020-12-27 05:27:46 -08:00
silicons 0cd0770549 fix 2020-12-26 21:32:12 -08:00
Letter N 1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
Timothy Teakettle 8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
DeltaFire 7aec74e9c9 Merge pull request #13845 from Citadel-Station-13/silicons-patch-37
fixes dullahans being hardcoded to ignore config unless it's halloween
2020-12-24 17:47:13 +01:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
DeltaFire f9f328a9ea we love this code 2020-12-23 20:12:06 +01:00
Letter N e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
silicons 11722f6f5e Update arachnid.dm 2020-12-22 17:47:53 -07:00
silicons 0f16f866eb Update arachnid.dm 2020-12-22 17:43:41 -07:00
silicons c1796db295 Update dullahan.dm 2020-12-22 09:47:26 -07:00
DeltaFire d796952800 Merge pull request #13835 from silicons/pugilist_parry
Pugilists can now parry most things with their bare hands
2020-12-22 17:42:19 +01:00
DeltaFire d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons 5fb90629e3 Merge pull request #13828 from timothyteakettle/tail-entwine-fix
fix: you can only entwine tails with people who have a tail
2020-12-22 09:32:26 -07:00
silicons 310d4d573b Update death.dm 2020-12-21 21:46:00 -07:00
silicons ea554b88a4 ok 2020-12-21 17:31:28 -07:00
silicons 5ff244a48c t 2020-12-21 17:20:44 -07:00
silicons 97e4aad75f changes 2020-12-21 17:14:22 -07:00
silicons ca6df29998 Update death.dm 2020-12-21 13:42:33 -07:00
timothyteakettle 3d897e8fc1 fixes tail entwining 2020-12-21 17:15:51 +00:00
Letter N abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N 98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons 34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
keronshb 3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons 13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07:00
silicons b34f5d56f6 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 22:54:16 -07:00
DeltaFire d3f3862e18 Merge pull request #13696 from silicons/slime_tf
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
2020-12-14 05:57:03 +01:00
DeltaFire 1aa032df32 Merge pull request #13752 from Citadel-Station-13/silicons-patch-15
tweaks stamcrit to be removed when under 100 stamina damage, rather than at 140
2020-12-14 05:32:28 +01:00
timothyteakettle 4cb93931d4 let them beep 2020-12-14 01:00:29 +00:00
silicons e79ce41f24 Update code/modules/mob/living/death.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2020-12-13 16:41:01 -07:00
Timothy Teakettle 016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
silicons 5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
Timothy Teakettle 76fe9c7f4c swap cooldown and cooldown check lines 2020-12-13 02:34:52 +00:00
Timothy Teakettle 866220aefb better cooldown 2020-12-13 02:33:57 +00:00
timothyteakettle 76b291c0b5 action 2020-12-13 01:16:25 +00:00
silicons 07d8e72125 fix 2020-12-12 11:19:45 -07:00
timothyteakettle 3a017d1173 it works 2020-12-12 01:49:50 +00:00
Timothy Teakettle 99f50addc7 wip 2020-12-11 20:35:37 +00:00
Lin c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes
custom eyes and tongues now properly carry across cloning
2020-12-11 16:59:05 +00:00
silicons 1153f30b63 Update carbon.dm 2020-12-11 02:26:52 -07:00
DeltaFire bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
Artur ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur 827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
timothyteakettle 43df7462d5 copy from old species 2020-12-07 23:03:28 +00:00