Commit Graph

1208 Commits

Author SHA1 Message Date
tkdrg
e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
TehZombehz
b4c165655d My first attempt at a commit. Adds a green version of the plaid skirt to the clothesmate. It's just a recolor. 2016-03-02 23:42:58 -06:00
phil235
45a7ae151e Merge pull request #15856 from MrStonedOne/patch-151
Use pick weight they said, it will be find they said. FUCK YOUR PICKWEIGHT (fixes suit sensors)
2016-03-02 16:40:05 +01:00
tkdrg
9211b19b38 Merge pull request #15836 from phil235/SpellFix
Fixes spell action button not being updated correctly
2016-03-01 21:09:20 -03:00
Kyle Spier-Swenson
19ad6ca347 Update clothing.dm 2016-03-01 01:34:16 -08:00
Kyle Spier-Swenson
1dcd0b1013 Use pick weight they said, it will be find they said. FUCK YOUR PICKWEIGHT 2016-02-29 23:15:18 -08:00
KorPhaeron
11f18b4a9b Merge pull request #15433 from MrStonedOne/patch-151
Makes suit sensors useful (Suit sensor random levels will now favor higher levels)
2016-02-29 20:04:03 -06:00
Kyle Spier-Swenson
8f51d44256 Update clothing.dm 2016-02-29 15:30:25 -08:00
phil235
3c8a9274bf Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message.
Fixes blind AI (lack of power) staying blind if transfered to a mech or a card.
Fixes magboots action button icon not updating when toggling the boots on.
Fixes Area teleport spells not having a cancel button when choosing the destination area.
Fixes spell action button not being removed when the spell is refunded.
Fixes revenant spell action button icons not being updated when the revenant is inhibited by a null rod.
2016-02-29 16:30:54 +01:00
tkdrg
77b7f02bdd Merge pull request #15775 from AnturK/fix1
Bunch of fixes
2016-02-27 21:27:08 -03:00
AnturK
0e5f26f9be Merge pull request #15762 from phil235/FixTheHood
Fixes suits with toggleable hood not having any toggle_hood action bu…
2016-02-26 23:52:44 +01:00
AnturK
59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01:00
Cheridan
3028684042 Merge pull request #15736 from CosmicScientist/riot_armour_description
Buffs riot armour
2016-02-26 05:31:01 -06:00
phil235
c60f5c29b3 Fixes suits with toggleable hood not having any toggle_hood action button.
Fixes some flags on the bloated human head gear.
2016-02-26 01:55:51 +01:00
AndrewJacksonThe2nd
e7b8e81ab6 Update chameleon.dm 2016-02-24 20:19:45 -08:00
AndrewJacksonThe2nd
dcbafb716b fixes 2016-02-24 19:33:37 -08:00
CosmicScientist
81956d0083 fixes desc of riot armour 2016-02-24 23:41:10 +00:00
AndrewJacksonThe2nd
38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
AndrewJacksonThe2nd
6a75d96966 Update chameleon.dm 2016-02-22 21:56:49 -08:00
AndrewJacksonThe2nd
583c2c3dea Fixes 2016-02-21 15:46:16 -08:00
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
AndrewJacksonThe2nd
5daae812f7 Chameleon PDA, fixes 2016-02-21 12:04:38 -08:00
AndrewJacksonThe2nd
89f07f0ab3 Chameleon Kit 2016-02-21 01:11:17 -08:00
AndrewJacksonThe2nd
5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
phil235
9ece63edfe Fixes internals not being turned off immediately when adjusting your mask off. 2016-02-19 17:49:38 +01:00
tkdrg
cc2ec12488 Merge pull request #15590 from KorPhaeron/icepacks
glorf jumpsuit
2016-02-18 20:37:20 -03:00
KorPhaeron
28b179908f glorf 2016-02-17 16:59:56 -06:00
phil235
54b87e0239 Fixes typo in suit.dmi
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
Kyle Spier-Swenson
5805f211e7 Use pick weight 2016-02-13 17:16:17 -08:00
phil235
5a96cf86ad Merge branch 'master' of https://github.com/tgstation/-tg-station into HatMaskFacialHairFixes
Conflicts:
	icons/mob/suit.dmi
2016-02-14 00:22:53 +01:00
phil235
fd16e02cdb Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
Fixes not seeing glasses through the riot helmet.
Fixes gas mask protruding from the abductor helmet.
Fixed radiation hood not hiding your hair, earpiece, mask.
Fixes colored justice hats not having an on-mob icon_stat.
Removed BLOCKHAIR bit from var/flags , moved it to flags_inv and renamed to HIDEHAIR
Added HIDEFACIALHAIR bitflag so certain hat/helmet can show just the beard.
Fixed human/update_inv_glasses not checking if our mask hides our glasses.
Fixed check_obscured_slots() not checking if our masj obscur our glasses.
Fixes some bits of flags_inv having the same value.
Fixes crusader hood and other headgear not hiding your identity when they should.
Fixes drone mask icon not appearing.
2016-02-14 00:03:07 +01:00
Thunder12345
e6da13511a Adds russian officer uniform
Adds russian officer
Minor tweaks
2016-02-13 20:11:58 +00:00
Thunder12345
b5c79e3781 Adds military russian
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
duncathan salt
c8d4d58124 Merge pull request #15424 from Firecage/humansuit
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-13 10:22:34 -06:00
tkdrg
d1ddb1d763 Merge pull request #15385 from KorPhaeron/inquisitor
Inquisitor Armour
2016-02-13 00:27:36 -03:00
Firecage
69569c4f81 merge conflict fix 2016-02-12 21:20:19 +02:00
Cheridan
c78f327100 Merge pull request #15432 from phil235/ChaplainHoodFix
Fixes masks appearing above the chaplain hood.
2016-02-12 12:38:35 -06:00
Kyle Spier-Swenson
0d643d5c09 Suit sensor random levels will now favor higher levels 2016-02-11 10:58:06 -08:00
phil235
43962ef288 Fixes masks appearing above the chaplain hood.
Fixes pirate captain coat hiding the jumpsuit despite having an opening in its center.
I removed the hood part appearing on the icon of the suits that have toggleable hoods, so there's no more confusion between the suit layer and the head layer.
2016-02-11 19:52:33 +01:00
Firecage
c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
duncathan salt
c77a9f6cb5 Merge pull request #14543 from StormAGeddonz/patch-1
Buffs medical, research, engi, and atmos hardsuits
2016-02-10 20:39:54 -06:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
tkdrg
6369e5cb67 Merge pull request #15299 from PKPenguin321/patch-14
Makes armor of various sec headgear consistent
2016-02-10 13:20:37 -03:00
KorPhaeron
c0f581493c Inquisitor 2016-02-10 02:24:50 -06:00
Cheridan
649ef7c2b3 Merge pull request #15252 from PKPenguin321/armorchameleon
Gives chameleon jumpsuits armor
2016-02-09 10:27:52 -06:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
PKPenguin321
eefeb813a4 gives caps bomb armor 2016-02-07 18:21:09 -08:00
PKPenguin321
6f660075a7 bumps beret armor up 2016-02-07 18:20:01 -08:00
PKPenguin321
c920ae1f15 bumps helmet armor up 2016-02-07 18:15:42 -08:00