Commit Graph

5600 Commits

Author SHA1 Message Date
silicons
67d9e79934 fix 2020-12-27 05:27:46 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08: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
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01: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
7da6979b54 ok 2020-12-21 00:28:03 -07:00
silicons
97824f4030 ok 2020-12-21 00:14:48 -07:00
silicons
eef2a323ed ok 2020-12-21 00:11:19 -07:00
silicons
ce10278c5a changes 2020-12-20 19:25:49 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons
0a593013e0 wew 2020-12-15 07:23:46 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
2844d2e4de fix 2020-12-14 06:01:32 -07:00
silicons
4db78b7868 Merge pull request #13757 from timothyteakettle/better-age-verification
changes the age gate to use date of birth
2020-12-13 23:09:41 -07: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
413bd23d0a dnr prevention 2020-12-13 23:07:12 -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
silicons
4451a96997 fixes 2020-12-13 20:12:14 -07: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
silicons
a4688557d7 Cryo 2020-12-13 02:29:31 -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
silicons
24c09edd03 stuff 2020-12-12 11:12:45 -07:00
timothyteakettle
3a017d1173 it works 2020-12-12 01:49:50 +00:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
Timothy Teakettle
99f50addc7 wip 2020-12-11 20:35:37 +00:00
Timothy Teakettle
45b22b2855 final touches 2020-12-11 19:41:56 +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
timothyteakettle
d1003c206a debug 2020-12-11 01:57:09 +00:00