Commit Graph

905 Commits

Author SHA1 Message Date
FalseIncarnate 0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
FalseIncarnate 954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05: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
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
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
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
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
Tastyfish 4c6a8b49e9 Fixed table placing messing up adjacent flipped tables 2016-01-22 12:01:03 -05:00
Fox-McCloud a5622a230f Ports Knight Armor 2016-01-22 07:14:55 -05:00
Tastyfish 2406f7f432 Fixes table flipping graphics 2016-01-20 03:41:09 -05:00
TheDZD b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Jey 189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Jey 6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00
Fox-McCloud eb5fcba6c5 Explosion Overhaul 2016-01-12 18:46:10 -05:00
SamCroswell 134e507ee6 Asset Protection Energy Gun 2016-01-08 00:27:51 -05:00
Fox McCloud 96f38d0ccd Merge pull request #3120 from Tastyfish/nano-piano
Instrument UI updated to modern nanoui.
2016-01-06 03:45:43 -05:00
TheDZD 3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD 73f6114b1f Merge pull request #3112 from Fox-McCloud/object-verb-restore
Restores a Few Object Verbs
2016-01-05 19:35:55 -05:00
Tastyfish 65e2a7fdff Updates/fixes instrument ui to be a nanoui 2016-01-05 02:26:45 -05:00
Fox-McCloud 4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud b69eb0a408 better checks and fingerprints 2016-01-04 16:53:35 -05:00
Fox-McCloud a7d1bcce4e Restores a Few Object Verbs 2016-01-04 16:42:53 -05:00
Fox-McCloud 38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox McCloud 9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -05:00
Tigercat2000 31aab5452b -tg- smoothing/floor refactor
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
2016-01-03 19:24:13 -08:00
Fox-McCloud e9d5c67371 securer crates 2016-01-03 21:02:48 -05:00
Fox-McCloud 0bb97a1636 Table Pushing Refactor+Fix 2016-01-03 02:12:31 -05:00
Certh 4082b59797 Dismantling girders now returns the same amount of metal as was used in construction the girders 2015-12-31 11:42:55 +01:00
Certh 54cffd53b4 Creating pool tables no longer uses up the entire stack of grass 2015-12-31 10:29:57 +01:00
Fox-McCloud d1a5d443eb more fixes 2015-12-27 00:52:56 -05:00
TheDZD 335c9bc399 Merge pull request #2917 from Fox-McCloud/remove-tribesmen
Nukes Jungle Module
2015-12-22 22:19:38 -05:00
Fox-McCloud 1796bcbc23 nukes jungle module 2015-12-21 22:32:54 -05:00
Spacemanspark 39737e6c05 Adds big cardboard boxes.
!
2015-12-20 15:31:24 -06:00
Aurorablade ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05:00
Aurorablade c3f662a6dc zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz 2015-12-15 03:08:16 -05:00
ZomgPonies cda81bf576 Makes girders spawn on top of any turf effects. 2015-12-14 09:23:51 -05:00
Aurorablade 76eaf85c11 sec sunglasses fix 2015-12-13 23:43:01 -05:00
Aurorablade 95d8b50345 hud_updateflag purge!
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
Aurorablade 424837ecad Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-12 19:06:04 -05:00
Spacemanspark e94fc84ca6 Fixes wall lockers.
HOORAH.
2015-12-11 14:38:57 -06:00
Aurorablade b88ddf0257 Diagnostic hud, file i miseed to make
and stuff updates right health wise.
2015-12-10 20:05:54 -05:00
Fox McCloud b0be9925d3 Merge pull request #2780 from RudiPardieck/deflation
bugfix: inflatable doors no longer disappear when deflating non-viole…
2015-12-08 22:03:02 -05:00
TheDZD 23b405a905 Merge pull request #2777 from RudiPardieck/grammar-fix
Fixes mistakes with using /improper instead of \improper
2015-12-08 22:01:25 -05:00
TheDZD 55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -05:00
Certh 522a7b7ac5 bugfix: inflatable doors no longer disappear when deflating non-violently 2015-12-08 16:45:27 +01:00
Certh d665bb0729 Fixes mistakes with using /improper instead of \improper 2015-12-08 10:37:42 +01:00