Fox-McCloud
d12b01d28c
Fixes Mutadone
2016-01-24 23:24:21 -05:00
Fox McCloud
152a214f2e
Merge pull request #3381 from TheDZD/control-freak
...
[s]Enables control_freak
2016-01-24 19:11:10 -05:00
TheDZD
388a265407
porta_turret fixes
...
Fixes infinite loop caused by porta_turrets when trying to target something on the same tile as the turret.
Also fixes a miscellaneous runtime with the mecha wormhole projector.
2016-01-24 17:13:47 -05:00
TheDZD
2e6b7c3c5b
Enables control_freak
...
Still allows for custom skins and macros. control_freak is disabled for admins.
2016-01-24 14:51:54 -05:00
TheDZD
1eb6050c43
Merge pull request #3369 from VampyrBytes/master
...
Fixes #3354 and goes with damage suggestion in #3367
2016-01-24 12:51:24 -05:00
VampyrBytes
1517e716b1
Fixes #3354 and goes with damage suggestion in #3367
...
If you try to stab someone in the eyes who doesn't have eyes they now
take 10-14 head damage
2016-01-24 09:34:41 +00:00
VampyrBytes
d1cdbc3739
Revert "Fixes #3354 "
...
This reverts commit d24b2fc014
2016-01-24 09:28:50 +00:00
Fox McCloud
835eddd600
Merge pull request #3366 from KasparoVy/Starsong-Beret-Fix
...
Fixes Vox Robes + Prefs Sec=High Beret Icon Gen. + Sigholt's Beret
2016-01-24 04:12:41 -05:00
VampyrBytes
d24b2fc014
Fixes #3354
...
If you stab someone who doesn't have eyes in the eyes it now damages
their head
2016-01-24 08:37:10 +00:00
KasparoVy
f769c9b23b
Fixes Vox Robes + Sec Preferences Beret Icon Generation + Sigholt's Beret @ Issue #3364
...
Does what it says on the tin
2016-01-24 02:22:55 -05:00
Fox McCloud
fa5b7e62f7
Merge pull request #3362 from Tastyfish/borg-deactivating
...
Fixed borg items spamming user chat every mob tick when on low power
2016-01-24 01:51:40 -05:00
Tastyfish
fb852462db
Fixed borg items spamming user chat every mob tick when on low power
2016-01-23 23:56:06 -05:00
KasparoVy
e9ad3965ce
Fixes Underwear Being Overlain by Body Markings
...
Gives underwear its own layer above markings, keeps generation pretty
much the exact same.
2016-01-23 20:16:39 -05:00
Fox-McCloud
0280b98cf6
"Fixes" Mecha Mining Scanner
2016-01-23 18:47:05 -05:00
Fox McCloud
92a27a141b
Merge pull request #3349 from Tastyfish/airless-floor
...
Fixed airless floor being plasteel airless floor
2016-01-23 18:39:36 -05:00
TheDZD
9e166b029d
Merge pull request #3335 from Fox-McCloud/knife-refactor-cargo-swat
...
Assault Surplus Crate and Knife Refactor
2016-01-23 18:20:54 -05:00
Fox McCloud
f7a114c5b2
Merge pull request #3350 from Tastyfish/fat-stacks-of-borg
...
Fixed cyborgs recharging all stack types
2016-01-23 18:14:50 -05:00
Fox-McCloud
fff0590492
Merge remote-tracking branch 'upstream/master' into knife-refactor-cargo-swat
2016-01-23 18:04:02 -05:00
TheDZD
eca90c1321
Merge pull request #3334 from Fox-McCloud/knight-armor
...
Ports Knight Armor
2016-01-23 17:51:51 -05:00
Tastyfish
f68121cafa
Fixed cyborgs recharging all stack types
2016-01-23 09:32:21 -05:00
Tastyfish
ec2e80ea65
Fixed airless floor being plasteel airless floor
2016-01-23 08:43:03 -05:00
Fox-McCloud
7d30c5aa8f
chaplain closet
2016-01-23 07:57:30 -05:00
Fox-McCloud
14a2022ef4
sword
2016-01-23 07:29:36 -05:00
Fox-McCloud
83e78de979
removes non-existent knife
2016-01-23 03:15:49 -05:00
Fox-McCloud
75e9466540
Fixes Hulk Not Properly Being Removed
2016-01-22 23:50:40 -05:00
Fox McCloud
ac28a4d85b
Merge pull request #3340 from VampyrBytes/master
...
Fixes issue #2690
2016-01-22 22:56:27 -05:00
VampyrBytes
1ff0baef66
Fixes issue #2690
...
Monkeys will now change first time. Also fixes a problem where any dna
changes in species were getting overwritten with human dna afterwards -
you can now change species dna to give abilities rather than having to
hardcode the verbs in
2016-01-22 17:56:00 +00:00
Tastyfish
4c6a8b49e9
Fixed table placing messing up adjacent flipped tables
2016-01-22 12:01:03 -05:00
Fox-McCloud
f5220f7ce3
Assault Surplus Create and Knife Refactor
2016-01-22 10:04:24 -05:00
Fox-McCloud
a5622a230f
Ports Knight Armor
2016-01-22 07:14:55 -05:00
Fox McCloud
e827aa1f11
Merge pull request #3332 from tigercat2000/fucking_commies
...
Fixes #3323 , sanitize your shit
2016-01-22 01:16:11 -05:00
Tigercat2000
9926210354
Fixes #3323 , sanitize your shit
2016-01-21 22:00:22 -08:00
Tigercat2000
be18f1a63a
Fixes #3303 , legit implants for adv_med
2016-01-21 21:42:09 -08:00
Fox McCloud
a24fde86b1
Merge pull request #3328 from tigercat2000/stupid_cma_i_fixed_you_already
...
Fixes #3301
2016-01-22 00:14:37 -05:00
Tigercat2000
8f1d7eb16b
Fixes #3301
...
For some reason, the s_tone of limbs was left out of the icon_key,
therefore making update_body use a cached image (I still question if these
actually help performance or worsen it) when it is not supposed to.
2016-01-21 20:53:03 -08:00
Fox McCloud
2c0a43a770
Merge pull request #3325 from tigercat2000/more_objective_fuckups
...
Fix #3259 in an annoying way
2016-01-21 23:39:54 -05:00
Tigercat2000
66368a40e4
Fixes #3319
...
tgstation/-tg-station#12208
2016-01-21 20:23:46 -08:00
Tigercat2000
bfcc172edc
Fix #3259 in an annoying way
2016-01-21 20:09:39 -08:00
TheDZD
e5436163d8
Merge pull request #3312 from Fox-McCloud/ling-hud
...
Implements Ling HUD
2016-01-21 23:07:58 -05:00
Fox-McCloud
a5f316111d
vampire tweaks
2016-01-21 18:58:09 -05:00
TheDZD
6ac55f7ee6
Merge pull request #3318 from Fox-McCloud/name-fix
...
Fixes Random Names on Human Mob Creation
2016-01-21 18:25:13 -05:00
Fox-McCloud
c184985a3d
Merge remote-tracking branch 'upstream/master' into ling-hud
2016-01-21 18:22:52 -05:00
TheDZD
145f3c34dd
Merge pull request #3314 from Fox-McCloud/blood-fix
...
Fixes Blood Death Redundancy
2016-01-21 18:22:14 -05:00
Fox McCloud
ccf7297da8
Merge pull request #3297 from Tastyfish/stop-hotwiring-the-tesla-you-tossers
...
Trained Poly on proper tesla engine use.
2016-01-21 18:21:48 -05:00
TheDZD
3ab3227073
Merge pull request #3305 from Fox-McCloud/vamp-hud-removal
...
Removes Vampire HUD
2016-01-21 18:21:39 -05:00
Fox-McCloud
2a857d99b9
tweak
2016-01-21 03:13:02 -05:00
Fox-McCloud
a07873eb22
Fixes Random Names on Human Mob Creation
2016-01-21 02:12:38 -05:00
Fox-McCloud
665f76cd11
tweak
2016-01-20 23:30:18 -05:00
Fox-McCloud
0eea85a3c1
Fixes Blood Death Redundancy
2016-01-20 23:14:55 -05:00
Fox-McCloud
fb11acbf79
Implements Ling HUD
2016-01-20 22:38:26 -05:00
