DeltaFire
c699113061
Merge pull request #13928 from Citadel-Station-13/silicons-patch-57
...
while we're at it let's make holoparasites not carry radiation either thanks @lbd
2020-12-31 19:01:12 +01:00
silicons
e91b3b7a81
Merge pull request #13916 from timothyteakettle/better-holoforms
...
reverts the removal of the holoform verb because kevin likes it
2020-12-30 14:45:23 -07:00
silicons
667651aebb
Merge pull request #13915 from Xantholne/Birdsitfix
...
Fixes new bird sprites defaulting to basic parrot when sitting
2020-12-30 14:44:28 -07:00
silicons
a9d831d10d
Update guardian.dm
2020-12-30 14:36:39 -07:00
DeltaFire
f957636a82
Merge pull request #13917 from timothyteakettle/squeak
...
*squeak
2020-12-30 18:32:30 +01:00
DeltaFire
eebb2e945a
Merge pull request #13902 from timothyteakettle/slime-legs
...
slimes can now have digitigrade/avian legs
2020-12-30 18:25:48 +01:00
Xantholne
19c954fb39
asdafsafas
2020-12-29 21:04:08 -07:00
Xantholne
0db821f4f5
Fixes missing electus red from trying to be basic parrot and adds
2020-12-29 19:33:09 -07:00
Timothy Teakettle
e9d5b622a1
squeak
2020-12-30 02:25:53 +00:00
Timothy Teakettle
5bc7c5a448
revert
2020-12-30 02:21:30 +00:00
silicons
a0fb594236
Merge pull request #13900 from Xantholne/Birds
...
Ports cute birbs from RP
2020-12-29 00:50:58 -07: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
Timothy Teakettle
bdb05f5e85
Merge remote-tracking branch 'upstream/master' into slime-legs
2020-12-28 17:22:53 +00: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
Xantholne
121b1bb7fd
Ports parrots from RP
2020-12-27 22:51:18 -07:00
silicons
67d9e79934
fix
2020-12-27 05:27:46 -08:00
silicons
0cd0770549
fix
2020-12-26 21:32: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
DeltaFire
f9f328a9ea
we love this code
2020-12-23 20:12:06 +01: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
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
