Commit Graph

494 Commits

Author SHA1 Message Date
kevinz000 9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
2019-05-11 22:21:16 -07:00
deathride58 0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -04:00
Trilbyspaceclone 0aa78684a5 I guess cookies unlock collars are not intended 2019-05-01 18:36:54 -04:00
kevinz000 970dc85b62 Merge pull request #8289 from Trilbyspaceclone/patch-111
Buffs cap hat and HOP hat
2019-04-30 05:18:52 -07:00
kevinz000 7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
2019-04-30 05:18:14 -07:00
Poojawa 3fd4e9ac22 Fixes medical helmet muzzle leak
tbh I though it'd look nice through the glass but HAHA FUCK BYOND
2019-04-29 04:31:33 -05:00
Trilbyspaceclone 70c5c47490 Lets not mistakenly nerf hop please? 2019-04-25 23:51:09 -04:00
Trilbyspaceclone 39fcf27beb Update jobs.dm 2019-04-25 23:48:12 -04:00
Trilbyspaceclone fcda4c0fbb Update _neck.dm 2019-04-25 20:40:48 -04:00
Poojawa 499078fb10 Headgear is more aggressive in setting normal style stuff
I swear byond's gotten a lot more dumb about if statements...
2019-04-15 22:04:37 -05:00
deathride58 a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa 30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Poojawa 7ffe49c511 Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks 2019-04-09 22:18:56 -05:00
Cyprian 644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Poojawa 6a26220fea Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks 2019-04-06 02:27:58 -05:00
Poojawa 49c518012b Properly account for tauric mode 2019-03-25 04:32:27 -05:00
Poojawa 25d079c4b8 Fixes blood overlay and shield issues for taurs 2019-03-18 03:19:18 -05:00
Poojawa fb1b76cafe compiles but I don't feel like spriting atm 2019-03-18 02:00:00 -05:00
kevinz000 821a31afb8 Merge pull request #8090 from deathride58/tgpushes
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
2019-03-10 13:51:44 -07:00
Coolgat3 45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3 eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
Coolgat3 af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
deathride58 d8f738184b Replaces disarm right click action with tgstation/tgstation#42958 's disarm action, also ports the removal of non-help intent pushing from that same pr 2019-03-04 21:05:50 -05:00
Trilbyspaceclone 81250ae377 Merge branch 'master' into morefamstuff 2019-02-14 20:38:54 -05:00
Trilbyspaceclone 3aee62eeb7 Update accessories.dm 2019-02-14 20:22:13 -05:00
Trilbyspaceclone b27ab885f3 [Ready] Adds new huds that help correct vision. (#7943)
* Fixing updater

* Adds the things

* Update all_nodes.dm

* Update misc_designs.dm

* Update hud.dm

* Update engine_goggles.dm

* Update _glasses.dm

* Update hud.dm

* Update packs.dm

* Update misc_designs.dm

* Update packs.dm

* Update hud.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update hud.dm

* Update misc_designs.dm
2019-02-05 18:09:34 -08:00
deathride58 2cd500de04 Merge pull request #7925 from Citadel-Station-13/kevinz000-patch-15
Radioactive Teleport Armor - Everyone Dies Edition
2019-01-21 19:45:51 -05:00
deathride58 a877e796d4 Merge pull request #7890 from Ragolution/endrapen
Suicide Messages, Combat Messages, Uniforms Recovered
2019-01-14 21:39:02 -05:00
kevinz000 a37684aae2 Update reactive_armour.dm 2019-01-12 10:47:35 -08:00
kevinz000 ac87048678 Update reactive_armour.dm 2019-01-12 10:45:52 -08:00
kevinz000 fc090a462e Update reactive_armour.dm 2019-01-12 10:45:00 -08:00
kevinz000 feeea1ab8c Update reactive_armour.dm 2019-01-12 10:40:16 -08:00
Trilbyspaceclone 353713fcee ERT suits shouldnt die to acid (#7897) 2019-01-08 02:30:47 -08:00
Ragolution 6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason.
I'm pissy that this was so easy and nobody else bothered to do it.
2019-01-04 01:55:33 -05:00
Trilbyspaceclone 687bbb1397 makes them = 2018-12-22 11:36:20 -05:00
Trilbyspaceclone 451dd8948a Update bio.dm 2018-12-22 11:22:48 -05:00
nik707 cae30f90ad Merge pull request #7799 from R3dtail/new_carpet
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
2018-12-10 16:45:38 -06:00
Redtail 4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
kevinz000 63bf5c54e1 Update reactive_armour.dm 2018-11-28 21:21:48 -08:00
kevinz000 02ec7a38ce Update reactive_armour.dm 2018-11-28 21:16:30 -08:00
kevinz000 a6d9a4f721 Update reactive_armour.dm 2018-11-28 21:14:30 -08:00
deathride58 fb704afb61 makes gloves of the northstar restore 2/3 of the stamina used up by harm intent punches on empty stam buffers (#7770) 2018-11-28 19:47:34 -08:00
nik707 b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
deathride58 e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5
[Ready] Nerfs reactive armor a bit.
2018-11-18 07:42:42 -05:00
deathride58 29bdaf3011 Merge pull request #7710 from Trilbyspaceclone/patch-8
[Grammar] [Ready] Makes Space Queens men pirate gear have better item descriptions
2018-11-18 07:39:14 -05:00
Trilbyspaceclone 5feebdc7d3 "Better Grammar or something" 2018-11-18 06:10:23 -05:00
deathride58 621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
Trilbyspaceclone 6694add91e ''honorable'' 2018-11-10 12:43:20 -05:00
Trilbyspaceclone 95b7ecfe39 Better item descriptions 2018-11-10 12:36:21 -05:00