09283ca485
beans
2020-10-03 13:49:20 +08:00
1620e3887c
Merge branch 'master' into species-refactor
2020-10-02 17:19:48 -05:00
bdd121cd81
Prep Work
2020-10-02 17:17:50 -05:00
52e8e2996c
allows players in deadchat to see explosions
2020-10-02 14:26:11 -05:00
418cd44bbe
SQUISH
2020-10-02 16:31:33 +01:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
05e1f7ca99
Update debuffs.dm
2020-10-01 12:50:41 -07:00
84a6624b03
Update cinematic.dm
2020-10-01 18:18:24 +08:00
3149732bbb
Merge pull request #13441 from Putnam3145/shiver-fever-patch
...
Makes fever use the proper thresholds and shivering have thresholds at all.
2020-10-01 03:11:23 -07:00
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
fb95d873aa
Merge pull request #13383 from Citadel-Station-13/silicons-patch-37
...
fixes bomb component allowing pickup
2020-10-01 11:42:21 +02:00
5418fb5b01
fixes minimaps and cinematic, also adds some dmdoc things
2020-10-01 17:36:56 +08:00
44f05bcb21
Merge pull request #13372 from Citadel-Station-13/silicons-patch-35
...
please stop using explosive holoparasites to make instant kill toolboxes
2020-10-01 02:35:12 -07:00
9f871dfa17
Makes shivering and fever not broken.
2020-09-26 11:22:24 -07:00
0746116e17
fixes a bunch of blacksmithing stuff
...
the blacksmithing skill is now actually dwarfy instead of not because of a typo
picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.
you can't interact with anvils while they are already being worked to prevent issues.
Also fixes associative skill level code a tiny bit.
2020-09-25 22:04:55 +02:00
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
9fef16964c
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-21 03:13:51 -07:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
868e464b40
fixes linter issues, removes acid degrading armor ( #13399 )
...
* fix
* more
* Update brawn.dm
* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
b9315c5080
Update airlock.dm
2020-09-18 04:26:22 -07:00
ca8b13b86a
Merge pull request #13255 from timothyteakettle/limbs
...
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
a54314193e
wire pulse prob to 10+severity/3.5
2020-09-16 03:36:46 +01:00
95ebeac5b6
fix
2020-09-15 17:27:11 -07:00
e7220e842e
things
2020-09-15 15:29:34 -07:00
2d8655d712
plushie shapeshifter
2020-09-13 03:25:43 +02:00
18d949e674
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
...
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
89f246db39
Merge pull request #13373 from BlueWildrose/why_my_hood_no_color
...
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
2020-09-11 14:14:16 -07:00
680872e08b
100% less band-aidy polyhood solution
2020-09-10 21:02:27 -07:00
9c58dbf2c5
Update killerqueen.dm
2020-09-10 12:00:17 -07:00
f634a31bfb
Update polychromic.dm
2020-09-09 15:28:45 -07:00
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
4f4b849b23
Update killerqueen.dm
2020-09-08 20:52:28 -07:00
2fdcfa4f07
Update killerqueen.dm
2020-09-08 20:50:06 -07:00
07b28f40de
Merge pull request #13359 from Ghommie/Ghommie-cit838
...
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
16e0292270
fixed.
2020-09-06 20:41:35 +02:00
71aa5b9642
Emergent runtime issue.
2020-09-06 20:40:24 +02:00
4a04b22b72
Turf visuals fix plus corrected names of a couple things.
2020-09-06 18:53:01 +02:00
4dacbbb0a9
deeper brass color™ (and damage)
2020-09-05 20:34:49 -04:00
cddd46fce3
Maybe this will work. Maybe it won't.
2020-09-05 18:52:20 -04:00
d6127d71a8
Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time
...
lets ipcs talk but i actually push my changes this time
2020-09-05 08:40:31 -07:00
f9bb245acc
DONT MAKE THE SAME MISTAKE
2020-09-05 16:32:41 +01:00
93501e2d3d
sorry ipcs
2020-09-05 16:24:58 +01:00
7b50b22c7b
Merge pull request #13244 from lolman360/AnPrimAssistants
...
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
2020-09-05 02:20:11 -07:00
e110945568
Merge pull request #13289 from kiwedespars/heretics-touchup
...
heretics touchup
2020-09-05 02:15:21 -07:00
3fb72e0fea
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
2020-09-04 11:43:31 +03:00
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
Letter N