Commit Graph

5502 Commits

Author SHA1 Message Date
silicons
57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
CoreFlare
1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
silicons
ee44cfc565 Update angel.dm 2020-09-22 22:06:11 -07:00
silicons
731bab4bc9 Update angel.dm 2020-09-22 16:20:47 -07:00
silicons
b3f145de10 Update species.dm 2020-09-22 16:20:13 -07:00
Blue Wildrose
006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
silicons
4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
silicons
0745f4ccd3 done 2020-09-20 23:12:19 -07:00
silicons
527458c901 amends 2020-09-20 21:48:18 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
d77fb0e17b amends 2020-09-20 13:53:43 -07:00
silicons
86ca2cb905 amends 2020-09-20 13:38:36 -07:00
silicons
fad91b1f79 fixes 2020-09-20 04:48:15 -07:00
silicons
8a54395f1a fixes 2020-09-20 04:33:49 -07:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
silicons
f4acef3cf8 fixes 2020-09-20 02:17:14 -07:00
silicons
102a452067 fixes 2020-09-20 02:14:41 -07:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
Putnam
39ac36c073 Changed an inaccurate comment. 2020-09-20 00:09:45 -07:00
silicons
97f373a199 whew 2020-09-19 16:17:26 -07:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
Timothy Teakettle
12bf3aebda Merge remote-tracking branch 'upstream/master' into cool-ipcs 2020-09-16 05:12:20 +01:00
Timothy Teakettle
0d8374a328 organic rendering 2020-09-16 05:09:21 +01:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +01:00
silicons
e7220e842e things 2020-09-15 15:29:34 -07:00
Artur
1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00
Timothy Teakettle
744792742b please fix it 2020-09-12 22:32:06 +01:00
silicons
563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
2020-09-11 14:15:37 -07:00
Timothy Teakettle
4bad1d23cb Update human_defense.dm 2020-09-10 23:22:34 +01:00
Timothy Teakettle
3d2206935c Update human_defense.dm 2020-09-10 23:22:29 +01:00
Timothy Teakettle
cb36f4ad24 travis we're friends right 2020-09-10 22:50:17 +01:00
Blue Wildrose
1b77e69fb4 Slimepeople diet changes 2020-09-09 18:11:25 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Artur
ff4c94c2d5 Fixes some verbs and gateway 2020-09-09 21:08:16 +03:00
silicons
419eb5ae05 Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
2020-09-07 13:42:31 -07:00
Artur
57ca2fbbe9 Updates ghost verbs on ghostize 2020-09-07 16:30:18 +03:00
Artur
1a79ffaf79 RE_Enter works properly now 2020-09-07 16:17:03 +03:00
Putnam
12b879c777 oh yeah xenos had handle_changeling (??) 2020-09-07 03:28:39 -07:00
Artur
b795806067 This shouldnt have been removed 2020-09-07 13:12:11 +03:00
Artur
589bedcfaf Fixes alt click, themes a little, and re enter corpse 2020-09-07 13:06:34 +03:00
Putnam
e75d1a1962 Signalizes ling/bloodsucker life code. 2020-09-07 02:00:22 -07:00