Commit Graph

1606 Commits

Author SHA1 Message Date
silicons
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
silicons
e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
2020-09-27 00:09:56 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
63b0d61c5b Reworked the selection to scale automatically with objective counts. 2020-09-19 23:35:04 -07:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
silicons
872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -07:00
silicons
cffc321050 more 2020-09-15 17:27:50 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Artur
1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
silicons
563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
2020-09-11 14:15:37 -07:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
DeltaFire
c056c8ac91 boom boom 2020-09-08 20:49:24 +02:00
Putnam
c9a5a9dd8e thanks byond strings, very cool 2020-09-07 02:20:54 -07:00
Putnam
e75d1a1962 Signalizes ling/bloodsucker life code. 2020-09-07 02:00:22 -07:00
silicons
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
silicons
e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup
heretics touchup
2020-09-05 02:15:21 -07:00
Putnam
4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10: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
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
413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
Putnam
dd6be82e06 Made heretics scale dynamic threat with power. 2020-08-29 18:43:15 -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
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
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +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
lolman360
f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
Putnam3145
ecbf8a5dc2 Merge pull request #13245 from Arturlang/fortitude_norun
Fortitude walking fix
2020-08-23 04:33:51 -07:00
Artur
b47b14cdaa Shoot me please 2020-08-23 14:26:07 +03:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
silicons
188bb13272 Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
2020-08-22 15:22:19 -07:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
silicons
3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons
slaughter demons to MOB_SIZE_LARGE
2020-08-17 03:15:16 -07:00
Putnam
8e9fb8eaae Buffs/hugboxes slaughter demons 2020-08-17 01:39:51 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons
83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons
66322c4d38 Merge branch '13156' 2020-08-16 18:50:29 -07:00
Hatterhat
88437bdea7 breakdown breakdown 2020-08-16 14:27:10 -05:00
kiwedespars
7c653d0891 i actually kinda like the idea that you need a point for paths.
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
2020-08-16 04:34:04 -07:00