c0ff43f827
ofc, New arguments.
2020-03-01 16:34:43 +01:00
97c5aa1e24
Maintainer suggestions
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 16:48:49 +02:00
20a5ab895f
Merge pull request #11268 from raspyosu/vamp-revamp
...
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
684b7714db
Update hud.dm
2020-03-01 08:21:25 -05:00
51c675603e
???
2020-03-01 02:48:13 -05:00
d00596b49d
fix cloak not restoring initial move intent sometimes (maybe)
2020-03-01 00:24:56 -05:00
cdd97e8547
she
2020-03-01 00:12:45 -05:00
e2b706961a
Turns out this is Rag's PR and not mine
...
Neet
Co-Authored-By: Ragolution <bloodlust3333@gmail.com >
2020-03-01 00:11:32 -05:00
899f1bbd88
Allow moaning while in soft crit
2020-02-29 21:02:37 -05:00
609dc0e792
Merge pull request #11242 from Kraseo/green-thumb
...
Adds reagent traits to Lavaland flora + a botany QOL change
2020-02-29 23:03:53 +01:00
295cd2991d
Merge pull request #11227 from Putnam3145/salbut-jitter
...
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
3c9d592b8a
Update miscellaneous.dm
2020-02-29 09:51:40 -05:00
f44908dc2e
forgot icon state changes
2020-02-29 02:03:25 -06:00
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
f48e56fe44
thanks mapdiffbot
2020-02-29 01:49:42 -06:00
c4113824f7
more fixes
2020-02-29 01:47:19 -06:00
70e2563579
Merge pull request #11266 from Ghommie/Ghommie-cit593
...
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
5ba6320f5e
Merge pull request #11261 from Ghommie/Ghommie-cit591
...
Fixing escaped characters in flavor texts.
2020-02-29 00:12:35 -06:00
a3eef43445
Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
...
Removes extra unwarranted paramedic access.
2020-02-29 00:11:16 -06:00
93d91b1808
Merge remote-tracking branch 'citadel/master' into sword_point
2020-02-28 13:39:56 -07:00
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
c5edeb9913
Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4
...
Cogchamp mixing sound made less annoyingly long.
2020-02-28 12:41:05 -07:00
5b6da0b350
ok
...
changes that artur suggested guess it makes no sense to add too much flavor
2020-02-28 13:29:36 -05:00
ed320046c5
fixes icons
2020-02-28 11:42:15 -06:00
7f7dced8b0
no message for automated
2020-02-28 06:15:08 -07:00
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
d0eebdbb02
Merge pull request #11273 from Arturlang/blob_broacast_exploit
...
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
c6fcffe949
Made the same mistake...
2020-02-28 13:19:27 +02:00
d6e402aa5d
Damned
2020-02-28 13:06:28 +02:00
a2970b5746
Update living.dm
2020-02-28 02:40:51 -07:00
23c3e5b328
tweaks for the tweaks
2020-02-28 00:17:28 -06:00
8953877a69
makes mesmerize not shitcode
...
woooooooo
2020-02-28 01:01:45 -05:00
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
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
f01a58a795
fix
2020-02-27 20:15:28 -07:00
ce8153e7fd
aa
2020-02-27 20:12:52 -07:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
9bd4719c0a
wrong type
2020-02-27 20:09:29 -07:00
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
f4e49f339b
k
2020-02-27 18:29:27 -07:00
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
1f88a22d04
Merge branch 'master' into big-chode-energy
2020-02-27 16:39:57 -06:00
b7aad30d3c
girth -> diameter
2020-02-27 16:38:14 -06:00
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
11f767d412
A couple mob holder oversights. Again?
2020-02-27 16:16:21 +01:00
eb3f985434
Update drinks_recipes.dm
2020-02-27 14:16:39 +01:00
ecf125477f
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-02-27 13:11:14 +01:00
d85563367e
Whoopsie
2020-02-27 12:39:01 +01:00
bfe3bbb6d5
Update paramedic.dm
2020-02-27 12:34:13 +01:00
b854cb5980
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
...
Adds 2cat, again
2020-02-27 01:22:25 -07:00
Ghommie