Commit Graph

10840 Commits

Author SHA1 Message Date
Tastyfish 8d55ceb371 Fixed fire alarm time left 2016-02-02 18:12:04 -05:00
Fox McCloud 6dd6afad8b Merge pull request #3455 from Glorken/knight-fight
Adds Knight Arena to Holodeck
2016-02-02 00:00:14 -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
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 c61b460d45 Merge pull request #3470 from pinatacolada/pinatabranch
Fixes #3465
2016-01-31 21:37:28 -05:00
pinatacolada 8df9725ea0 Fixes #3465
Swarmers become unable to eat space pods
2016-02-01 01:24:16 +00:00
Fox McCloud ce2fbdc345 Merge pull request #3356 from pinatacolada/master
Makes the surgery computer useful
2016-01-31 19:27:03 -05:00
Fox McCloud 1b94a5b0b3 Merge pull request #3448 from VampyrBytes/Bugfix-(#3425)
Fixes #3425
2016-01-31 19:16:36 -05:00
TheDZD f12e56cd69 Merge pull request #3445 from Fox-McCloud/summon-guns
Updates Summon Guns
2016-01-31 18:44:12 -05:00
Fox-McCloud 57073340cf you shall not cast 2016-01-31 01:04:27 -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
Tastyfish ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Fox McCloud 5f5c0e093a Merge pull request #3435 from FalseIncarnate/master
Magic Eight Ball
2016-01-30 19:11:39 -05:00
Glorken 5e2591aa71 Adds Knight Arena to Holodeck
Creates a holodeck option akin to the thunderdome, but with knight armor
and claymores. Also adds blue and red claymore sprites.
2016-01-30 17:26:52 -05:00
Tastyfish 7027c217bf Some items has plasma typo in origin tech 2016-01-30 15:04:33 -05: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
Fox-McCloud 9ff52f91a8 Updates Summon Guns 2016-01-29 22:54:07 -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
Tastyfish 37277fb21c Made HoP show up in supply too, with QM a third color 2016-01-29 15:03:26 -05:00
Fox-McCloud 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05: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
Tastyfish 511a9757de Renamed manifest section Support to Service 2016-01-28 22:30:45 -05:00
Tastyfish ba2f797ed3 Adds Supply section to manifest 2016-01-28 21:12:20 -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
TheDZD c2c760b555 Merge pull request #3415 from Fox-McCloud/riot-shields
TG Riot Shield Port and Tweaks
2016-01-27 22:18:12 -05:00
Fox-McCloud 243fae96c6 flag split 2016-01-27 16:36:43 -05:00
pinatacolada 8d7011cd38 Adds a threshold for the health announcer 2016-01-27 17:49:57 +00:00
Crazylemon64 8acf396cf2 Makes the DNA scanner less stupid 2016-01-26 23:50:29 -08:00
Fox-McCloud 913922b408 Adds in Skeleton Race 2016-01-27 00:45:32 -05:00
Fox-McCloud 2242fac80a TG Riot Shield Port and Tweaks 2016-01-26 22:06:05 -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 dcde6936ac Merge pull request #3384 from KasparoVy/Blueshield-Beret-Fix
Blueshield Beret Tweak
2016-01-26 00:04:38 -05:00
TheDZD d65ecc987e Merge pull request #3385 from Fox-McCloud/genetics-fixes
Fixes Mutadone
2016-01-25 23:41:03 -05:00
Crazylemon64 d71e807fa4 Ghosts can now see the contents of smartfridges 2016-01-25 10:39:14 -08:00
Crazylemon 9099116ae7 Ais can now hear their radio again 2016-01-25 10:12:42 -08:00
KasparoVy cf005e9987 Readds black beret to locker, gives it armour. 2016-01-25 02:08:38 -05:00
Fox-McCloud d12b01d28c Fixes Mutadone 2016-01-24 23:24:21 -05:00
KasparoVy 5e4a2b5dea Blueshield Beret Tweak
Adds a navy blue version of the Centcom Officer's beret, giving it to
the Blueshield.

Gives the Blueshield beret the exact same armour and strip-delay values
as the SECURITY OFFICER'S beret.
2016-01-24 22:48: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
pinatacolada feacb84b3a updated to reflect what Fox pointed out
also added a thing to show the blood type on the UI that I left out as an oversight
2016-01-24 14:19:21 +00: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
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
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