Commit Graph

26267 Commits

Author SHA1 Message Date
DeltaFire
3435a99ec7 Merge pull request #13882 from silicons/subtler_tables
adds subtler emote that wraps around adjacent tables
2020-12-28 17:55:27 +01: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
f89edd5c10 Merge pull request #13886 from Citadel-Station-13/silicons-patch-47
respawn text now shows AFTER motd (probably)
2020-12-28 17:46:36 +01:00
DeltaFire
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
DeltaFire
a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
2020-12-28 17:42:26 +01:00
DeltaFire
9b6d4c1371 Merge pull request #13889 from Citadel-Station-13/silicons-patch-49
adds recursive pulling check to space transitions
2020-12-28 17:39:59 +01:00
DeltaFire
58accc3782 Merge pull request #13898 from Putnam3145/fix-coma-sleep
Makes regen coma properly work at 25% when sleeping; makes coma more precedent
2020-12-28 17:34:14 +01:00
DeltaFire
bd0c799e66 Merge pull request #13896 from Sonic121x/patch-3
cydonia helmet fix & taur(naga&canine)Ert hardsuit
2020-12-28 17:15:49 +01:00
DeltaFire
8b723ab6c7 Merge pull request #13894 from Citadel-Station-13/silicons-patch-52
reduces coldslowdown to tempdiff / 35 instead of tempdiff / 20
2020-12-28 17:11:33 +01:00
DeltaFire
49252f4eff Merge pull request #13893 from Citadel-Station-13/silicons-patch-51
Nerfs meth and morphine to only remove damage slowdown rather than all slowdown (read this carefully, as this affects lings)
2020-12-28 17:10:26 +01:00
DeltaFire
8843a830d2 Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +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
Putnam
fd8f5c4afd Makes coma more precedent. 2020-12-27 17:54:53 -08:00
Putnam
33358776ec Makes regen coma properly work at 25% when sleeping 2020-12-27 17:49:15 -08:00
keronshb
365abe1c5a Allows Energy Bola to be catchable
Allows Energy Bola to be catchable
2020-12-27 17:15:59 -05:00
Sonic121x
1afcc2cd4c Update hardsuit.dm 2020-12-28 04:46:25 +08:00
Sonic121x
b51a2e939e Update miscellaneous.dm 2020-12-28 04:21:52 +08:00
Sonic121x
ad9fc238e7 Update hardsuit.dm 2020-12-28 04:19:37 +08:00
silicons
50de8d7590 Update atmospherics.dm 2020-12-27 12:43:21 -07:00
silicons
c25c6b01d7 Update atmospherics.dm 2020-12-27 12:41:07 -07:00
silicons
952f5f8716 Update drug_reagents.dm 2020-12-27 12:32:14 -07:00
silicons
5e269c327a Update space.dm 2020-12-27 10:53:11 -07:00
silicons
d4f94724ec Update plushes.dm 2020-12-27 10:51:44 -07:00
silicons
798b1b50f4 Update plushes.dm 2020-12-27 10:38:07 -07:00
silicons
1c0e3fcd12 Merge pull request #13873 from BlueWildrose/FasterThanTheSpeedOfLight
Nyctophobia quirk now triggers in 0.2 seconds instead of instantly
2020-12-27 10:24:10 -07:00
HeroWithYay
d06c82ae64 It has the wrong description, fixing it. 2020-12-28 03:21:41 +13:00
silicons
e0c928a745 Update respawn.dm 2020-12-27 06:57:15 -07:00
silicons
ec2df686c3 maybe 2020-12-27 05:31:58 -08:00
silicons
67d9e79934 fix 2020-12-27 05:27:46 -08:00
silicons
d574996db9 Merge pull request #13846 from DeltaFire15/robot-antag-healing
Ling & Bloodsucker healing now affects IPCs / Synths
2020-12-27 05:48:48 -07:00
silicons
3535916fd8 fix 2020-12-26 22:02:56 -08:00
silicons
1c06dd92c2 fix 2020-12-26 21:55:17 -08:00
silicons
fa6537a092 fix 2020-12-26 21:53:38 -08:00
silicons
5bd20acc1d fix 2020-12-26 21:44:37 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
silicons
fb2b4f05c1 Merge branch 'subtler_tables' of github.com-kevinz000:silicons/Citadel-Station-13 into subtler_tables 2020-12-26 18:43:09 -08:00
silicons
36125c609d ily putnam 2020-12-26 18:41:31 -08:00
silicons
97be4a5d12 Update say_vr.dm 2020-12-26 17:34:31 -07:00
silicons
b885abb69d okay 2020-12-26 16:28:10 -08:00
silicons
27ecbdd6f1 why did i do this 2020-12-26 16:22:14 -08:00
Lin
b0b483105a Merge pull request #13857 from silicons/contractor_fix_for_real
fixes contractor pods this time for real (and 25% tested instead of 0%)
2020-12-26 23:52:51 +00:00
DeltaFire
9b165220a6 Merge pull request #13879 from Citadel-Station-13/silicons-patch-45
admin varedit now bypasses toxlover because accidentally killing people is not okay
2020-12-26 19:48:24 +01:00
silicons
017db3de90 Update topic.dm 2020-12-26 11:05:18 -07:00
silicons
646db6ef32 Update rust_lore.dm 2020-12-26 11:03:51 -07:00
Blue Wildrose
1d296e2816 addtimer proc instead of sleep 2020-12-25 20:18:02 -07:00
Blue Wildrose
147f148c78 Nyctophobia quirk: Effect now triggers in 0.2 seconds instead of instantly 2020-12-25 19:05:13 -07:00
silicons
879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
DeltaFire
971ea2010f Merge pull request #13865 from Citadel-Station-13/silicons-patch-41
cell/proc/give() no longer lets you give negative charge
2020-12-25 19:46:16 +01:00
silicons
6c7b2386d8 Merge pull request #13850 from DeltaFire15/welder-autorefuel-fix
Fixes self-refueling welders
2020-12-25 10:28:59 -07:00