Commit Graph

9625 Commits

Author SHA1 Message Date
silicons
db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
silicons
1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix
Makes plastitanium rapier not silently poison for pacifists.
2020-08-31 21:19:09 -07:00
Putnam
2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
silicons
ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Hatterhat
0db189333a >one fucking callback 2020-08-30 21:21:27 -05:00
Putnam
6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam
4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam
9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00
Putnam
15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam
5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
silicons
69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02:00
raspy-on-osu
c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
Putnam3145
7c5197f383 Merge pull request #13249 from Citadel-Station-13/silicons-patch-25
removes firedoor autoopen on touch
2020-08-29 22:34:43 -07:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
2020-08-29 21:41:06 -07:00
silicons
1ed712d69d Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port
ports #52214 from /tg/: fix for mecha backstabbing
2020-08-29 21:40:13 -07:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
silicons
16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
2020-08-29 21:33:28 -07:00
silicons
413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
GrayRachnid
1234b51e82 Revert "Buffs defib users by making them stop pulling automatically" 2020-08-30 00:24:31 -04:00
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00
silicons
8cc84152d8 Merge pull request #13267 from Arturlang/op_slimes
Lets slime damage structures
2020-08-29 21:22:27 -07:00
Putnam
669bab841c Made cost being more than threat delta more punished. 2020-08-29 20:44:45 -07:00
Putnam
19b856aebf Removed story's curve. 2020-08-29 20:23:11 -07:00
silicons
bbb5c076c5 Update defib.dm 2020-08-29 20:05:55 -07:00
necromanceranne
a0adc984cd ports #52214 from /tg/ 2020-08-30 12:19:38 +10:00
silicons
2c3b268aa6 Update meteors.dm 2020-08-29 18:42:46 -07:00
silicons
a251648f28 Update meteors.dm 2020-08-29 18:39:50 -07:00
Putnam
d8d67d3d3e And fixed their antag flag, too 2020-08-29 16:51:57 -07:00
Putnam
64e379c7ed Added property weights to latejoin heretics, too 2020-08-29 16:51:38 -07:00
Putnam
9a4c76e787 Added property weights to heretic, too. 2020-08-29 16:47:07 -07:00
Putnam
6725ced453 Makes heretics actually able to be edited in the config. 2020-08-29 16:45:16 -07:00
Putnam
126ebf1f5e Update dynamic_storytellers.dm 2020-08-29 01:50:22 -07:00
Putnam
cda93af643 Fixes dynamic... again. 2020-08-29 01:41:42 -07:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N
116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
raspy-on-osu
ca34a50726 Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295 2020-08-27 23:39:43 -04:00
lolman360
55c8250324 AAAAAAAAAAAAAAAAA 2020-08-28 12:44:59 +10:00
Hatterhat
1eb3473132 absolutely goes apeshit on desword data 2020-08-27 19:09:24 -05:00
Chiirno
2df4bedb06 All the errors deleted away 2020-08-27 14:44:19 -03:00
Chiirno
fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
silicons
664b2490c3 Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
2020-08-27 10:07:31 -07:00
Timothy Teakettle
fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
silicons
9440a92c09 Merge pull request #13258 from shellspeed1/iv-drips
Ports drip feeding mode for iv drips from tg.
2020-08-27 10:02:43 -07:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Artur
6c8b256e48 dont griff please 2020-08-26 20:23:19 +03:00
Artur
aaa8046dd2 Lets slime damage structures 2020-08-26 19:32:17 +03:00