Commit Graph

25833 Commits

Author SHA1 Message Date
silicons 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
The0bserver c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
The0bserver af97bddf87 It begins. Earthmother preserve me. 2020-08-30 11:38:46 -04:00
Timothy Teakettle 34393a187b fix ipcs 2020-08-30 16:27:09 +01:00
Putnam 6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam 10586f3c3b trend, trend! 2020-08-30 07:33:17 -07:00
Putnam 4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -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
Hatterhat 3b571e2edf oh jesus fuck its all gone wrong 2020-08-30 01:33:56 -05:00
Trilbyspaceclone da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
silicons a8f920f88c Update _lists.dm 2020-08-29 22:48:26 -07: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 d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates
Modifies the Eminence teleport-to abilties a bit
2020-08-29 21:40:22 -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 05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
silicons bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
2020-08-29 21:35:58 -07:00
Tupinambis 39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05: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 5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2
Fix Tea and give them a glass sprite
2020-08-29 21:33:21 -07:00
silicons 413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
silicons 033feebcd0 Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
2020-08-29 21:31:24 -07:00
silicons 50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
2020-08-29 21:24:41 -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
silicons 84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
silicons 78b8072d13 Merge pull request #13272 from Detective-Google/patch-1
plasmamen are playable now
2020-08-29 21:21:23 -07:00
silicons 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
silicons e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
silicons e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2
Further tweaks the TEG's power output
2020-08-29 21:19:18 -07:00
silicons 5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
silicons ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip
Nukies can't get wall-boots anymore
2020-08-29 21:17:26 -07:00
Hatterhat 00bc4202f7 what the fuck was i thinking coding this 2020-08-29 23:08:51 -05: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
Hatterhat 34861d55a8 fuck it two megas standard 2020-08-29 21:38:31 -05:00
necromanceranne a0adc984cd ports #52214 from /tg/ 2020-08-30 12:19:38 +10:00
Putnam dd6be82e06 Made heretics scale dynamic threat with power. 2020-08-29 18:43:15 -07:00