Commit Graph

995 Commits

Author SHA1 Message Date
Kraseo 50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom 9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Kraseo e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
Kraseo 648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Kraseo 5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Kraseo ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo 38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Ghom 20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
raspyosu d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
raspyosu 5b6da0b350 ok
changes that artur suggested guess it makes no sense to add too much flavor
2020-02-28 13:29:36 -05:00
kevinz000 e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000 d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
Artur c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
raspyosu 8953877a69 makes mesmerize not shitcode
woooooooo
2020-02-28 01:01:45 -05:00
raspyosu 43e4877a34 rearrange mesmerize end code
linzolle pointed out it doesn't work which is correct and this seems to work just fine now
2020-02-28 00:07:14 -05:00
raspyosu bc882b2126 nerf mesmerize range
lunge should have more range than mesmerize imo so let's just yoink
2020-02-27 19:10:31 -05:00
raspyosu 9ec828f1f2 lunge & mesmerize tweaks
lunge nerfed (holy FUCK)
- windup reverted to 0.7s
- range reverted to 3
- adjacency check fixed (must've been tired)
mesmerize
- now can be broken via line of sight breaking (checks for LoS every 0.5s there is probably a better way of doing this)
2020-02-27 16:29:15 -05:00
kevinz000 19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
kevinz000 648e304ef8 Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
2020-02-27 00:53:10 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom 954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Artur b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02:00
Artur f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
Trilbyspaceclone 2aeb1e1b4a Update overmind.dm 2020-02-25 00:32:45 -05:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
raspyosu 28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
raspyosu 4de8391ba4 fix filenames zzzz
does this work even time to fIND OUT
2020-02-21 01:40:35 -05:00
raspyosu 7d769b3984 preemptive lunge buff
range increased by 1
windup length decreased by 0.1s to 0.6s
grabbing system altered to make grabbing more instantaneous depending on range
telegraphing sound now plays to the user as well for feedback
2020-02-21 01:34:22 -05:00
Ghom 8395ee53e7 Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
Ghom 6347dab0a3 Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
2020-02-20 15:31:39 +01:00
Artur 5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
Artur 35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +02:00
kevinz000 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
raspyosu 00f21ed685 revert mesmerize spammability
used to not begin cooldown upon windup fail, now does
2020-02-19 23:37:11 -05:00
kevinz000 a06fcea985 Merge remote-tracking branch 'citadel/master' into vampire_haste 2020-02-19 19:16:58 -07:00
kevinz000 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
Unknown c920d198e2 Update Viro to /tg/ standards 2020-02-19 12:17:57 -05:00
Artur d635af0caa Conflict Fix 2020-02-19 13:11:33 +02:00
Artur 87d55c5be6 Reworks it 2020-02-19 13:09:09 +02:00
raspyosu a570a8fea8 this is fine
it's fine
2020-02-18 23:24:01 -05:00
raspyosu 6e013d7f8c zzzzzz
the rest of the changes to be described in new pr
2020-02-18 23:18:52 -05:00
raspyosu 9803a0835c lunge tweaks
added short (20 frames at 30fps) windup w/ telegraphing via audio only played to target
range increased to 4
added flavor text
2020-02-18 19:04:20 -05:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 3785c94a1b more responsive 2020-02-18 03:57:39 -07:00
kevinz000 ef05410b75 k 2020-02-18 03:32:04 -07:00
kevinz000 1e57463d1b k 2020-02-18 03:16:47 -07:00