Commit Graph

103 Commits

Author SHA1 Message Date
AnturK 59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01: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
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 5d5d2427f4 temp 2016-02-20 22:12:25 -08: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
tkdrg 6b3e02e9be Merge pull request #15056 from bgobandit/mimefeels
Mimes can now alter their mask to display different emotions.
2016-01-31 11:51:40 -03:00
bgobandit 40a2d8e6d1 no spaces, cycle proc, honk honk honk 2016-01-30 19:47:31 -05:00
bgobandit 11043a07f6 Adds scared mime mask and adjusts sad mime mask :( 2016-01-30 18:59:25 -05:00
bgobandit 170a87e69b Alt-click and action button 2016-01-30 16:32:30 -05:00
bgobandit 859058f053 Mimes can now alter their mask to display different emotions. 2016-01-29 21:10:31 -05:00
KorPhaeron 2cb4b85b4a Fixes hailer 2016-01-23 12:34:01 -06:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
bgobandit 3dd8262e93 the honkmother is ashamed of this typo 2015-10-14 13:11:02 +13:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
CosmicScientist 26190b90ee Adds carp spacesuit + mask, carp costume and ian costume. 2015-07-28 00:06:32 +01:00
phil235 3da34d436b Changed hailer overload, it now simply breaks the hailing system. 2015-07-23 15:02:11 +02:00
phil235 511a87724b Move sec hailer gas mask into its own file
Adding overload when spamming the sec hailer. Burn damage for the user except if silicon (em pulse instead).
2015-07-21 19:34:04 +02:00
WJohn a93dde3034 Merge pull request #10384 from Steelpoint/GasMask
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
2015-07-16 11:25:13 -04:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Steelpoint 2780f62ec9 CollapsingIntensifies 2015-07-05 01:23:19 +08:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
phil235 588c12ee22 Merge pull request #10219 from xxalpha/mouthgag
Fixed not being able to eat with adjusted masks.
2015-06-29 18:23:56 +02:00
xxalpha 0ab6b99658 Flag cleaning. 2015-06-29 00:08:49 +01:00
phil235 c1a37bb2e0 Derp, I hate fixing merge conflicts... 2015-06-28 15:27:58 +02:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Ikarrus 6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
xxalpha 16504ef0cf Cleaned some clothing flags. Ported turf/Entered optimization from vg. 2015-06-23 01:52:14 +01:00
phil235 b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
kingofkosmos 494403969e Alt-click-toggles now do proper checks
Such as if you're near the thing, conscious, alive etc.

Fixes #9238
2015-05-18 20:22:04 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 5f169e8e47 Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.

Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.

Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.

Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.

Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
dannno 39aaea6f28 WEEOO NOISE 2015-03-24 15:41:59 -04:00
Jordie e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
Xhuis 3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04:00
Remie Richards f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
Cheridan e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
Sometinyprick e5b53f2e3c Finishing up 2015-02-21 01:26:58 +00:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Sometinyprick 52477eb16e Adds a new spell. The Barnyard curse
Created a new file because I didn't want to get rid of the horseman
curse. Essentially the same as the horseman curse but you can also be a
pig and a cow.
2015-02-17 00:44:45 +00:00
phil235 a545af2e4a Fixes the cyborg sechailer being adjustable. 2015-02-14 00:30:31 +01:00
dannno 4bc4d44ab7 action button and headmaskform removes, terrorists win 2015-01-13 17:30:42 -05:00
dannno 555afcfb58 tkdrg's generalization suggestion no more snowflake 2015-01-13 17:16:41 -05:00
dannno 5dc6f1449f when in hat form, bandanas can be added to head slot
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
dannno f8573ba257 u know what it is 2015-01-11 16:08:21 -05:00
paprka 40943d5684 reverts some sechailer and other feature things 2014-12-13 00:09:58 -08:00
paprka e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
phil235 515807ee67 Fixes adjustmask verb for sechailer letting you chose the user mob from a list of all mobs on screen. 2014-12-02 19:25:31 +01:00