Commit Graph

1554 Commits

Author SHA1 Message Date
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
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
DeltaFire
e611023114 FUCK 2020-08-16 02:53:29 +02:00
kiwedespars
9b5f7f7bb6 buffs mansus grasp.
- ash grasp has 75% cd on proc'd mark again
- rust grasp now emps on hit.
- grasp in general does 60 stam instead of 40, because it's a good idea for solo antags to be able to 1v1 sec
2020-08-15 14:29:32 -07:00
DeltaFire
6e896ea68d more kindle cooldown, some minor stuff
Kindle cast time: 15ds > 25ds
Belligerent moved to the file where it should be and sort priorities modified accordingly.
2020-08-15 23:06:10 +02:00
Artur
9772f40fe5 whoops 2020-08-15 22:25:22 +03:00
Artur
a97f293a87 Hopefully fixes bloodsucker vassals 2020-08-15 22:24:22 +03:00
kiwedespars
aa46e355da more more more.
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
2020-08-14 05:19:57 -07:00
Artur
4f4b243947 Thats that 2020-08-14 11:12:14 +03:00
Lin
0c9facf6b5 Merge pull request #13151 from Citadel-Station-13/silicons-patch-11
why did we comment out abductor batons from being buyable
2020-08-13 18:51:39 -05:00
silicons
a51518f2c6 Update console.dm 2020-08-13 15:41:04 -07:00
silicons
6d93f15ad3 Update orderable_gear.dm 2020-08-13 15:40:13 -07:00
kiwedespars
bff11c4fe5 fixes, changes.
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648)
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629)
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
Lin
ddb3db5796 Merge pull request #13114 from Citadel-Station-13/silicons-patch-1
"it'll be fine Sables, nothing bad will happen if we remove the /mob blacklist from radiation"
2020-08-11 18:10:01 -05:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
kiwedespars
4750b41b99 do you think i could really get away with this 2020-08-10 21:18:03 -07:00
silicons
c45ad3af6e Update revenant.dm 2020-08-10 21:14:20 -07:00
kiwedespars
cac77ec121 probably important right now for admin-given heretics to receive equipment. 2020-08-10 21:06:15 -07:00
kiwedespars
415e2556f9 descriptions, conflict, and actually puts requirements for the gamemode. 2020-08-10 20:59:51 -07:00
kiwedespars
c09960c48f woops fixed sacrificing, husks people instead of gibbing now. 2020-08-10 20:00:42 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Hatterhat
7c7eff12c3 wizard buyable 2020-08-08 00:52:39 -05:00
Letter N
cc98f50eb6 what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though 2020-08-07 11:25:36 +08:00
silicons
009f0ebeeb Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
164201ab27 Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
Makes bloodsucker death not spam now actually working
2020-08-05 15:15:30 -07:00
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
DeltaFire
831ea372f8 buncha stuff
adds a check if the sigil is already busy which I forgot before, makes the brass claw wounds-2 compartible and changes some misc stuff
2020-08-04 17:33:57 +02:00
DeltaFire
2a197af1c0 Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff 2020-08-04 17:30:38 +02:00
DeltaFire
276d35a693 moves a check a few lines
tin
2020-08-04 16:59:02 +02:00
Letter N
07c02e1c99 Commit message. Fixes slab 2020-08-04 16:26:30 +08:00
Letter N
7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
DeltaFire
160991c5b4 Caps claw damage
The claw can now only have a maximum of bonus 18 damage caused by combo (after 10 consecutive hits against the same target), making it 33 damage total. The target shouldn't be standing by then anyways if they attacked them consecutively, but if they still are, better to have this capped.
2020-08-03 23:15:14 +02:00
DeltaFire
a2155f9e91 more codersprite
clockie arm implants now have a somewhat different looking sprite (totally not just a normal arm implant recolor)
2020-08-03 22:13:50 +02:00
DeltaFire
619a2e47b9 tiny phrasing change 2020-08-03 18:37:05 +02:00
DeltaFire
9649a900e9 tweak to sigil of rites
The sigil of rites now needs two invokers to be able to be summoned.
2020-08-03 18:20:26 +02:00
DeltaFire
d1622053d2 kindle tweaks
Time to cast back up to 1.5 seconds because yeah no you can't just stand still for a moment and kindle the guy chasing you.
But also: Kindle now mutes for five seconds (instead of 2) after it ends, and causes stuttering for five seconds after it ends (instead of 3)
2020-08-03 18:08:47 +02:00
DeltaFire
be44bcfd1c removes debug messages
not forgetting that.
2020-08-03 18:00:38 +02:00
DeltaFire
b15ed5e3d1 smol tweaks 2020-08-03 17:58:18 +02:00
DeltaFire
c898b54ed3 span & class torture
Unfucks a bunch of span stuff, adds a few comments
2020-08-03 17:55:10 +02:00
DeltaFire
a75aac288d Makes the Sigil of rites summonable and adds some more rites
The sigil of rites can now be summoned for 1400 power at tier two.
Two new rites are available: The rite of woundmending, which heals any wounds (not damage) a target may have, but causes 10 toxins damage per wound healed aswell as the rite of the claw, which summons a brass claw implant on the rune. This rite specifically can only be used a limited amount of times
2020-08-03 17:25:37 +02:00
Timothy Teakettle
2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
DeltaFire
7c871cbad1 oops 2020-08-03 15:43:35 +02:00