Commit Graph

26895 Commits

Author SHA1 Message Date
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
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
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
lolman360 f223c9eeb5 eee 2020-08-29 18:38:17 +10:00
Hatterhat 3c8a4b38c4 harmies 2020-08-29 02:47:46 -05: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
Hatterhat 1546347231 name 2020-08-28 20:40:27 -05:00
Hatterhat 7ed2a3cbfe update 2020-08-28 20:28:05 -05:00
Hatterhat 5dd09c2402 the one where i make it work 2020-08-28 20:20:19 -05:00
kiwedespars 578f078a2d whoops i forgot to make it not emp 2020-08-28 16:46:55 -07:00
kiwedespars a7d68281a3 new changes
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
Hatterhat 2c0964a138 god this feels so much worse 2020-08-28 18:31:41 -05:00
silicons adc75a1d50 Merge branch 'master' into revert-13122-haha 2020-08-28 15:31:38 -07:00
raspy-on-osu 4f2f6b537e credit's already given in the pr let's not 2020-08-28 13:44:41 -04:00
Timothy Teakettle b76cf0004b ui adjustment 2020-08-28 18:34:00 +01:00
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01: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
lolman360 c2ded74d6a e 2020-08-28 12:54:58 +10: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
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