Commit Graph
4817 Commits
Author SHA1 Message Date
DeltaFireandGitHub 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
DeltaFire f9f328a9ea we love this code 2020-12-23 20:12:06 +01:00
siliconsandGitHub 11722f6f5e Update arachnid.dm 2020-12-22 17:47:53 -07:00
siliconsandGitHub 0f16f866eb Update arachnid.dm 2020-12-22 17:43:41 -07:00
siliconsandGitHub c1796db295 Update dullahan.dm 2020-12-22 09:47:26 -07:00
DeltaFireandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 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 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
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
LinandGitHub 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
siliconsandGitHub 1153f30b63 Update carbon.dm 2020-12-11 02:26:52 -07:00
DeltaFireandGitHub 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
LinandGitHub 3b6553899b Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore
Medibots now only treat those they can actually treat
2020-12-06 06:36:28 +00:00
LinandGitHub cbcf60ff76 Merge pull request #13733 from DeltaFire15/tail-entwine-fix
Tailcoilies fix
2020-12-06 06:12:57 +00:00
DeltaFireandGitHub 663fff03c6 Merge pull request #13720 from timothyteakettle/podpeople-green-blood
podpeople have green blood but done correctly
2020-12-06 03:43:19 +01:00
DeltaFire 0c4e9ca1c5 better phrasing 2020-12-05 02:56:03 +01:00
DeltaFire f0c1890a65 fix 2020-12-05 02:48:33 +01:00
siliconsandGitHub 31cf8842e4 Update death.dm 2020-12-02 23:45:18 -07:00
siliconsandGitHub d43086572d Update carbon.dm 2020-12-02 23:44:35 -07:00
Timothy Teakettle d0ebd6c2d8 green blood 2020-11-30 19:22:54 +00:00
DeltaFireandGitHub 6bdb54117b Merge pull request #13687 from Citadel-Station-13/silicons-patch-6
https://github.com/tgstation/tgstation/pull/54991 - tail intertwining
2020-11-29 18:13:12 +01:00
siliconsandGitHub 0d6986d3a2 Update jellypeople.dm 2020-11-27 02:25:41 -07:00
silicons e7c02de01e k 2020-11-26 23:16:25 -07:00
DeltaFire 21734b5d63 there we go 2020-11-26 23:04:39 +01:00
DeltaFire 566d74bd77 E 2020-11-26 16:12:08 +01:00
DeltaFire 67303ce7be Update medbot.dm 2020-11-26 00:19:47 +01:00
DeltaFire b487c7cb57 actually 2020-11-25 23:53:33 +01:00