kevinz000
4b9dfdf476
types
2020-02-28 13:24:39 -07:00
kevinz000
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
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
Ghom
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
ancientpower
ed320046c5
fixes icons
2020-02-28 11:42:15 -06:00
Ghom
c9a5f49623
Fixing a whoopsie with airlocks.
2020-02-28 17:28:02 +01:00
kevinz000
7f7dced8b0
no message for automated
2020-02-28 06:15:08 -07:00
kevinz000
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000
25f86c18d1
Merge pull request #11260 from Kraseo/i-hate-gangs
...
Removes soporific sniper rifle rounds from gang uplinks
2020-02-28 04:29:22 -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
kevinz000
a2970b5746
Update living.dm
2020-02-28 02:40:51 -07:00
Seris02
b195783dfb
yeet 6
2020-02-28 14:31:47 +08:00
Seris02
f8adb4a80c
yeet 5
2020-02-28 14:30:29 +08:00
ancientpower
23c3e5b328
tweaks for the tweaks
2020-02-28 00:17:28 -06:00
raspyosu
8953877a69
makes mesmerize not shitcode
...
woooooooo
2020-02-28 01:01:45 -05:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06: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
kevinz000
f01a58a795
fix
2020-02-27 20:15:28 -07:00
kevinz000
ce8153e7fd
aa
2020-02-27 20:12:52 -07:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
kevinz000
9bd4719c0a
wrong type
2020-02-27 20:09:29 -07:00
BlackMajor
fc4f9e7800
How about a few more roids.
2020-02-28 16:07:57 +13:00
kevinz000
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
kevinz000
f4e49f339b
k
2020-02-27 18:29:27 -07: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
Detective-Google
1f88a22d04
Merge branch 'master' into big-chode-energy
2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c
girth -> diameter
2020-02-27 16:38:14 -06: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
Ghom
879032c52f
Merge pull request #11255 from deathride58/sprintconfigdefaults
...
Makes the default sprint config options match live's actual config
2020-02-27 16:23:27 +01:00
Ghommie
11f767d412
A couple mob holder oversights. Again?
2020-02-27 16:16:21 +01:00
Ghom
eb3f985434
Update drinks_recipes.dm
2020-02-27 14:16:39 +01:00
Seris02
8140962275
yeet 4
2020-02-27 21:05:27 +08:00
Seris02
d3385fb8c8
yeet 3
2020-02-27 21:03:50 +08:00
Seris02
a14fe06241
probably fixes it
2020-02-27 20:51:19 +08:00
Seris02
6e6b8fbd8a
yeet 2
2020-02-27 20:35:53 +08:00
Seris02
5edfcd2927
yeet
2020-02-27 20:33:57 +08:00
Ghommie
ecf125477f
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-02-27 13:11:14 +01:00
Ghom
ebe16768d4
Merge pull request #11249 from Trilbyspaceclone/patch-298
...
Corrects bar stool name
2020-02-27 12:40:41 +01:00
Ghom
d85563367e
Whoopsie
2020-02-27 12:39:01 +01:00
Ghom
bfe3bbb6d5
Update paramedic.dm
2020-02-27 12:34:13 +01:00
kevinz000
b854cb5980
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
...
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChen
f6c170d31b
Update tails.dm
2020-02-27 08:15:27 +00:00
YakumoChen
e682845ebf
Update tails.dm
2020-02-27 08:09:34 +00:00
kevinz000
b0018a246c
Merge pull request #11248 from Putnam3145/lick-pref
...
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
YakumoChen
2cb95e200a
Update tails.dm
2020-02-27 08:04:32 +00:00
kevinz000
19962493a9
Merge pull request #11241 from Arturlang/Solar_updates
...
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
YakumoChen
e0c7c98253
Update tails.dm
2020-02-27 08:01:13 +00:00
kevinz000
924c7e0d05
Merge pull request #11235 from Detective-Google/if-it-compiles-it-works
...
unfucks paramedics access + PDA
2020-02-27 01:00:45 -07:00
