shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,821 Commits 5 Branches 0 Tags
c1544ffe46a4bbc965fc68abfcdf6b341e737be8
Commit Graph

507 Commits

Author SHA1 Message Date
kevinz000
74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing 
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
 2019-05-20 23:30:28 -07:00
Poojawa
5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00
kevinz000
ed4c9506a7 Merge pull request #8388 from Useroth/collars-n-shit 
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
 2019-05-18 08:30:10 -07:00
Useroth
8ea639a5ac Quick fix for the colorable collars. 2019-05-18 15:26:46 +02:00
deathride58
d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit 
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
 2019-05-17 00:10:41 -04:00
Useroth
701b01dfa6 Just another commit to make travis fucking recompile it 2019-05-15 02:30:47 +02:00
Useroth
8500e69088 Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit 2019-05-15 02:09:41 +02:00
Useroth
3f64128513 Apply suggestions from code review 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 02:08:43 +02:00
Useroth
6a29a0744b Applied suggested changes. 2019-05-15 02:07:16 +02:00
Useroth
f910eea9f8 Update code/modules/clothing/neck/_neck.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 01:41:18 +02:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
Useroth
4355584833 Added them to loadout too. 2019-05-09 12:09:18 +02:00
Useroth
abe8ed16cb A small touch-up. 2019-05-09 11:38:33 +02:00
Useroth
1efd7123f2 Two new collar types. All collars are now colorable a'la polychromic stuff. 2019-05-09 11:22:51 +02: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