Commit Graph

12041 Commits

Author SHA1 Message Date
Fox McCloud 78d40c3f87 Merge pull request #3449 from VampyrBytes/bugfix(#3414)
Fixes #3414
2016-02-02 00:00:55 -05:00
Fox McCloud 0d9f2da748 Merge pull request #3462 from KasparoVy/Masks-For-BIGNOSE
Sharing is Caring: Masks Galore
2016-02-01 23:55:25 -05:00
KasparoVy aa4e1eb970 Sharing is Caring: Masks Galore
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.

Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:

    Balaclava, up and down state
    All bandana colours (+ skull pattern), up and down states
    Breath mask, up and down state
    Clown mask+wig
    Cyborg mask
    Death Commando mask
    Gas mask
    All wrestling masks
    Medical mask, up and down state
    Mime mask
    Owl mask
    Plague doctor mask
    Ninja mask
    Sechailer, up and down state
    Sexy Clown mask+wig
    Sexy Mime mask+wig
    Sterile/Surgical mask, up and down state
    SWAT mask
    Welding gas mask, visor up and down state
    Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
    All smokeables re-positioned so non-humans aren't smoking through their cheek.

Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
2016-02-01 17:49:37 -05:00
VampyrBytes 3e7f1e7499 removes unneeded srcs 2016-02-01 10:26:52 +00:00
Fox McCloud 509e4cad02 Merge pull request #3461 from Tastyfish/suicide-squish
Better species suicide support
2016-02-01 01:54:49 -05:00
Fox McCloud 1b94a5b0b3 Merge pull request #3448 from VampyrBytes/Bugfix-(#3425)
Fixes #3425
2016-01-31 19:16:36 -05:00
TheDZD 4ece68aeed Merge pull request #3437 from Crazylemon64/syndicate_borg_access
Re-adds remote syndicate borg access to places
2016-01-31 18:45:58 -05:00
Tastyfish b3e7e9595b Better species suicide support 2016-01-31 00:41:33 -05:00
Tastyfish c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -05:00
Fox McCloud c2d791a40a Merge pull request #3440 from Crazylemon64/skrell_liver
Skrell's alcohol weakness is tracked on the liver
2016-01-30 21:21:51 -05:00
Fox McCloud 26085be1f8 Merge pull request #3439 from Crazylemon64/squishy_limbs_squish
People with squishy limbs can now squish
2016-01-30 21:21:30 -05:00
Fox McCloud 5f5c0e093a Merge pull request #3435 from FalseIncarnate/master
Magic Eight Ball
2016-01-30 19:11:39 -05:00
Tastyfish 7027c217bf Some items has plasma typo in origin tech 2016-01-30 15:04:33 -05:00
VampyrBytes 1a512ccf76 Fixes #3414
reset's hud warnings during species change so they don't get stuck on
2016-01-30 09:05:29 +00:00
VampyrBytes bb15d5f133 Fixes #3425
There were a couple of things going on... the spawn(-1) which should
have meant that the door shut straight away was being negated by the
sleeps. Also, If the door had just been used, it would still be marked
as operating and so wouldn't shut
2016-01-30 08:49:56 +00:00
TheDZD 50d77408f6 Merge pull request #3444 from Fox-McCloud/explosion-damage-refactor
Refactors Human Explosion Damage
2016-01-29 23:07:45 -05:00
Fox-McCloud 500cc7b12a apparently, this is a thing 2016-01-29 21:51:09 -05:00
TheDZD 868504bdc4 Merge pull request #3430 from Fox-McCloud/liches
Adds in Lichdom and Lesser Summon Guns Spells--Wiz Tweaks
2016-01-29 21:47:10 -05:00
Fox-McCloud 1321158fbf Refactors Human Explosion Damage 2016-01-29 21:45:57 -05:00
Crazylemon64 0ef973b37e People with squishy limbs can now squish 2016-01-29 10:51:07 -08:00
Fox-McCloud 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Crazylemon64 7267f890f6 Re-adds syndicate borg access to places 2016-01-28 23:48:00 -08:00
Fox McCloud 6a904adc1b Merge pull request #3436 from Crazylemon64/vox_sprite_fix
Fixes voxxy sprite bug! Yaya!
2016-01-29 02:13:06 -05:00
Crazylemon64 b47b7063dc Fixes voxxy sprite bug! Yaya! 2016-01-28 23:07:00 -08:00
FalseIncarnate 98dfd5f90d Magic Eight Ball
Adds in a new toy: Magic Eight Ball!
- Discern your fate with the wondrous Magic Eight Ball!
- Obtainable from Claw Game prize balls

Adds in the mighty MAGIC CONCH SHELL.
- Submit to the will of the all-knowing Magic Conch.
- Admin-spawn only (too powerful)
2016-01-28 23:40:37 -05:00
Crazylemon64 9072a7075d Skrell's alcohol weakness is tracked on the liver 2016-01-28 20:17:00 -08:00
FalseIncarnate 70804d49fc Fixes plants attempting to sting ghosts
Fixes #3427
2016-01-28 21:38:54 -05:00
Fox-McCloud cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
TheDZD 3c35269615 Merge pull request #3417 from Fox-McCloud/spoopy
Adds in Skeleton Race
2016-01-28 16:02:18 -05:00
Fox McCloud 9a2a307ad7 Merge pull request #3426 from Crazylemon64/astral_rune_fix
Having many runes on the same tile will not break astral project
2016-01-28 02:52:46 -05:00
Crazylemon64 0c92ebd701 Having many runes on the same tile will not break astral project 2016-01-27 23:32:57 -08:00
TheDZD dcac23cd46 Merge pull request #3393 from Fox-McCloud/remove-cael-pls
Removes External Shield Generators
2016-01-27 16:49:28 -05:00
Fox-McCloud 243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Fox-McCloud 913922b408 Adds in Skeleton Race 2016-01-27 00:45:32 -05:00
Fox McCloud cf36332734 Merge pull request #3395 from Crazylemon64/snoopy_ghosts
Ghosts can now see additional machines
2016-01-26 20:18:50 -05:00
Fox McCloud 5f3b7c5798 Merge pull request #3392 from KasparoVy/Toeless-Jackboots
Open Toed Footwear
2016-01-26 20:18:39 -05:00
Fox McCloud 7e6a4577eb Merge pull request #3388 from FalseIncarnate/master
Hydroponics Reagent Refactor
2016-01-26 20:18:27 -05:00
KasparoVy 7a9f7e5f24 Open Toed Boots
Feat. (feet) toeless jackboots.

Inspired by the toeless jackboots on Polaris.
This works the same as gloves. You take wirecutters, click the footwear,
and bam! Changes the sprites, and opens the toe-- letting Unathi and
Tajara wear the footwear if they weren't allowed already.

If you try to cut open the toes of already toe-cut footwear, it won't
let you.
If you try to cut open the toes of footwear that don't support that
functionality, it does nothing.

Also brings match-shoe lighting up to the same standard as glove and boot
cutting.
2016-01-26 01:55:32 -05:00
Fox McCloud dcde6936ac Merge pull request #3384 from KasparoVy/Blueshield-Beret-Fix
Blueshield Beret Tweak
2016-01-26 00:04:38 -05:00
TheDZD 4677f4ed64 Merge pull request #3408 from Fox-McCloud/radiation-fixes
Fixes Radiation Runtimes
2016-01-25 23:42:02 -05:00
TheDZD 31382df640 Merge pull request #3409 from Fox-McCloud/store-fix-for-real
Fixes Unlimited Boxes
2016-01-25 23:41:51 -05:00
Fox McCloud 85f524c0fc Merge pull request #3368 from Crazylemon64/mat_eat_tweak
Humans with matter eater can now grab eat
2016-01-25 22:43:41 -05:00
Fox McCloud 29fa7dfedf Merge pull request #3400 from Crazylemon64/supermatter_sanity
Supermatter explosion now only affects mobs on the same z-level
2016-01-25 22:42:29 -05:00
Fox McCloud 1438c1435f Merge pull request #3404 from Crazylemon64/stop_right_there_brain_scum
Brainmobs can no longer ethereal jaunt
2016-01-25 22:41:44 -05:00
Fox-McCloud fb45705973 Fixes Unlimited Boxes 2016-01-25 22:37:22 -05:00
Crazylemon 07a62934e4 Brainmobs can no longer ethereal jaunt 2016-01-25 19:21:40 -08:00
Fox-McCloud 666a6d6228 mass hallucination runtime 2016-01-25 20:36:21 -05:00
Fox-McCloud 5bd27677f5 Fixes Radiation Runtimes 2016-01-25 20:32:20 -05:00
TheDZD 099276db1f Merge pull request #3405 from Fox-McCloud/minor-reagent-fix
Fixes Kahlua, Silencer, and BananaHonk
2016-01-25 20:03:46 -05:00
Crazylemon b6e737c151 Supermatter explosion now only affects mobs on the same z-level 2016-01-25 17:03:09 -08:00