Commit Graph
17680 Commits
Author SHA1 Message Date
Timothy Teakettle bdb05f5e85 Merge remote-tracking branch 'upstream/master' into slime-legs 2020-12-28 17:22:53 +00:00
Timothy Teakettle d80920a500 oops! all 0s! 2020-12-28 17:10:28 +00:00
Timothy Teakettle 50fd36efa5 oops! all runtime! 2020-12-28 17:04:48 +00:00
Timothy Teakettle b0fdbd3b1d Update preferences.dm 2020-12-28 17:01:55 +00:00
DeltaFireandGitHub b1be0159e2 Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
heretics uses killonce objectives
2020-12-28 17:56:58 +01:00
DeltaFireandGitHub 13cd2c4424 Merge pull request #13880 from Citadel-Station-13/silicons-patch-46
antag rep configs are now actually possible to set for jobs with more than one word in the title
2020-12-28 17:56:17 +01:00
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
Xantholne 51ac7286e6 aaaaaaa 2020-12-28 00:57:32 -07:00
siliconsandGitHub e8fea4cf1b Update human_defines.dm 2020-12-28 00:19:35 -07:00
Xantholne 2cca3314a7 Adds to bird crate 2020-12-27 23:55:58 -07:00
Xantholne 121b1bb7fd Ports parrots from RP 2020-12-27 22:51:18 -07:00
Timothy Teakettle b03bd6fe8e Update preferences.dm 2020-12-27 22:03:28 +00:00
Sonic121xandGitHub 1afcc2cd4c Update hardsuit.dm 2020-12-28 04:46:25 +08:00
Sonic121xandGitHub b51a2e939e Update miscellaneous.dm 2020-12-28 04:21:52 +08:00
Sonic121xandGitHub ad9fc238e7 Update hardsuit.dm 2020-12-28 04:19:37 +08:00
Timothy Teakettle 67741b7561 Update preferences_savefile.dm 2020-12-27 20:09:32 +00:00
siliconsandGitHub 952f5f8716 Update drug_reagents.dm 2020-12-27 12:32:14 -07:00
siliconsandGitHub 3f026749c8 Update mutations.dm 2020-12-27 12:15:17 -07:00
siliconsandGitHub 824427ce2f Update mutations.dm 2020-12-27 12:11:27 -07:00
siliconsandGitHub e0c928a745 Update respawn.dm 2020-12-27 06:57:15 -07:00
silicons 67d9e79934 fix 2020-12-27 05:27:46 -08:00
siliconsandGitHub 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 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
timothyteakettle fcd8d35c76 thank 2020-12-27 02:23:57 +00:00
siliconsandGitHub 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
LinandGitHub 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
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
DeltaFireandGitHub 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
siliconsandGitHub 92b2177316 Update _job.dm 2020-12-26 11:35:09 -07:00
siliconsandGitHub 017db3de90 Update topic.dm 2020-12-26 11:05:18 -07:00
siliconsandGitHub 646db6ef32 Update rust_lore.dm 2020-12-26 11:03:51 -07:00
siliconsandGitHub f5ecdad8e9 Update eldritch_antag.dm 2020-12-26 10:58:46 -07:00
silicons 879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
Timothy Teakettle 8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
DeltaFireandGitHub 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
siliconsandGitHub 26a777c011 Merge pull request #13863 from Hatterhat/armbandnames
armbands UNIQUE_RENAME
2020-12-25 10:28:33 -07:00
siliconsandGitHub 488bf18106 Update apc.dm 2020-12-24 21:31:02 -07:00
siliconsandGitHub f2b16b82fc Update cell.dm 2020-12-24 21:26:25 -07:00
Hatterhat aa7c871b59 yea 2020-12-24 18:15:04 -06:00
DeltaFireandGitHub 146135f059 Merge pull request #13836 from silicons/statpanel
refactors statpanel a bit to send topics to client instead of item which bypasses problematic /Topic overrides entirely
2020-12-24 18:29:33 +01:00
DeltaFireandGitHub 1c82bd689f Merge pull request #13830 from timothyteakettle/apid-fix
fixes apids(bees) not rendering
2020-12-24 18:07:15 +01:00