Commit Graph

24704 Commits

Author SHA1 Message Date
silicons ee0d86f201 fix 2020-08-31 14:14:53 -07:00
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
silicons 69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02: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
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 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
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
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
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
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
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
DeltaFire 105c98d12f eminence moment
commants out 'teleport to ark', gives the Eminence the ability to teleport to obelisks instead.
2020-08-29 21:30:20 +02:00
Putnam 177bfaefaf Added health exemption to a couple events that need it. 2020-08-29 04:46:18 -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
ForrestWick 84ed82c9e7 whyseris 2020-08-28 22:09:30 -04:00
raspy-on-osu 4f2f6b537e credit's already given in the pr let's not 2020-08-28 13:44:41 -04:00
raspy-on-osu 96d006f551 oops 2020-08-27 23:48:19 -04: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
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
raspy-on-osu d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
Lynxless 4caeb310f7 Added blank line to the end of files 2020-08-27 15:59:07 -03:00
Lynxless 828a65a7fd New branch test 2020-08-27 15:46:40 -03: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