Commit Graph

5129 Commits

Author SHA1 Message Date
TheDZD cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade
Arcade Prize Counter
2016-02-17 16:57:49 -05:00
FalseIncarnate f44602ab79 Src, Spans, and Chainsaws
Cleans up some src and src.loc in the toys, arcade, and prize counter
files

Replaces some text macros with proper spans

Removes the attack proc from the toy chainsaw, preventing them from
making sounds on hit.
- Still makes the revving sound when you wield them
2016-02-15 02:32:29 -05:00
Fox-McCloud 9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
FalseIncarnate 0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
TheDZD af648474cf Merge pull request #3583 from Fox-McCloud/permit-refactor
Refactors Bot Weapon Identification
2016-02-13 18:23:12 -05:00
Fox-McCloud f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Fox McCloud aa7b36487b Merge pull request #3580 from VampyrBytes/PlasticBags
Fixes plastic bags suffocating when they shouldn't (#3577)
2016-02-12 13:46:06 -05:00
VampyrBytes 90c485355f Fixes plastic bags suffocating when they shouldn't (#3577)
As title. Now checks your head slot for the bag rather than relying on a
variable that might not be reset in time
2016-02-12 11:37:19 +00:00
FalseIncarnate 954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
KasparoVy c00121e47a Grey Smokables 2016-02-10 23:07:26 -05:00
Fox McCloud 4b973163a6 Merge pull request #3548 from Spacemanspark/Spark-plays-too-much-Pokemanz
Adds Pokemon to the game.
2016-02-10 00:51:11 -05:00
Fox McCloud 9ec6286446 Merge pull request #3550 from Tastyfish/tables3
Fixed extra table legs
2016-02-09 17:57:32 -05:00
Spacemanspark b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Tastyfish 13cf94c2f3 herp 2016-02-09 01:58:17 -05:00
Tastyfish ca5d48487f Fixed tables... again 2016-02-09 01:09:32 -05:00
Spacemanspark 24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
VampyrBytes 8e627b384c Bolas now affect walking people
As per #3509 bolas no longer require a running stance to trip people
2016-02-08 10:10:37 +00:00
Fox McCloud e3acd96ce7 Merge pull request #3525 from Regen1/powersink
Updates powersink to be similar to TG
2016-02-07 15:11:52 -05:00
Fox McCloud 1d984acda0 Merge pull request #3502 from VampyrBytes/cleanSlips
Cleans up slipping code
2016-02-07 15:11:23 -05:00
TheDZD f45a09122c Merge pull request #3522 from Fox-McCloud/sink-and-toilet-fixes
Sink and Toilet Fixes+Refactor
2016-02-07 15:03:23 -05:00
Regen 1464bb3862 Updates powersink to be similar to TG 2016-02-06 18:20:34 +01:00
Fox-McCloud fec86a78e4 as requested 2016-02-06 03:01:45 -05:00
Fox-McCloud 2e244feb0c Sink and Toilet Fixes 2016-02-06 01:25:52 -05:00
Fox-McCloud 78af714755 Fixes Bear Trap IEDs and Duplicate Bear Traps 2016-02-05 23:29:20 -05:00
VampyrBytes de45fc9aba Cleans up slipping code
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
2016-02-03 09:44:32 +00: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 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
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 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
TheDZD 3c35269615 Merge pull request #3417 from Fox-McCloud/spoopy
Adds in Skeleton Race
2016-01-28 16:02:18 -05:00
Fox-McCloud 243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Fox-McCloud 2242fac80a TG Riot Shield Port and Tweaks 2016-01-26 22:06:05 -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
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
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
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 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
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
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