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
f6c170d31b
Update tails.dm
2020-02-27 08:15:27 +00:00
e682845ebf
Update tails.dm
2020-02-27 08:09:34 +00:00
b0018a246c
Merge pull request #11248 from Putnam3145/lick-pref
...
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
2cb95e200a
Update tails.dm
2020-02-27 08:04:32 +00:00
19962493a9
Merge pull request #11241 from Arturlang/Solar_updates
...
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
e0c7c98253
Update tails.dm
2020-02-27 08:01:13 +00:00
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
f00a2c1cd3
Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
...
Beegions, But With Actual Bees
2020-02-27 00:59:57 -07:00
40c36213df
Merge pull request #11244 from Ghommie/Ghommie-cit589
...
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
2020-02-27 00:57:54 -07:00
a8a8e242d8
Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
...
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
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
a91464bf64
Fixing escaped characters in flavor texts.
2020-02-27 02:29:44 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
954f03f4e0
Merge pull request #11150 from raspyosu/master
...
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
1711fcaa06
k
2020-02-26 15:56:01 -07:00
27b6469c67
Forgot a var
2020-02-26 16:42:38 +02:00
b536c061fb
Reviewer suggestion and co
2020-02-26 16:26:57 +02:00
25a2b34c38
some fixes
2020-02-26 05:59:53 -07:00
872872d9f9
move stuff
2020-02-26 05:38:34 -07:00
fc64c0a008
yeah woops forgot that
2020-02-26 18:02:07 +08:00
de6e8012f3
balances yee
2020-02-26 17:49:37 +08:00
c906f8f17f
lickable.
2020-02-25 20:49:01 -08:00
0a698d1eeb
oy.
2020-02-25 20:07:07 -08:00
ebac066b2f
lets add traitor classes
2020-02-25 16:10:23 -08:00
6b2bbe0133
there fixed
2020-02-26 06:51:03 +08:00
76c1d5ddb9
k
2020-02-25 15:40:00 -07:00
5a320c7933
fugg u
2020-02-25 14:37:40 -07:00
40c2bdf5ee
oh boy
2020-02-25 14:06:12 -07:00
74d6473c3b
Initial Commit
...
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
2020-02-25 17:07:40 +02:00
e02a6f6dea
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
2020-02-25 15:37:02 +01:00
56d5899bbc
Merge pull request #11236 from bunny232/master
...
Sentience event preference xenomorph to sentience potion
2020-02-25 15:19:28 +01:00
00403a39c6
Reverts tracker changes somewhat
2020-02-25 15:47:15 +02:00
170e092a24
this is going to end well
2020-02-25 13:14:18 +01:00
raspyosu