Commit Graph

230 Commits

Author SHA1 Message Date
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
Ikarrus 3d5f126779 Destructible Clothing [WIP]
- Clothes can be set on fire and extinguished
  - Any item can technically be set on fire and extinguished now, but only clothes (and paper) actually burn right now
  - All of a mob's clothing are burned if the mob is husked by fire
- Clothes will also have a chance of being shredded if you are caught in a bomb blast
  - The bigger the explosion, the higher the chance they have of being destroyed
  - Outer layer clothing (headgear and exosuits) take the shock first, which absorbs some of the shock for the clothes it covers, according to it's bomb armor
2015-06-25 00:06:47 -06:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
xxalpha 0797226d2e Merge remote-tracking branch 'upstream/master' into chief
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-06-23 21:50:16 +01: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
Remie Richards f15c81d527 Caps armour to 90% damage reduction, bai bai invincibility, Adds armour_penetration variable to /item, counted for melee weapon and gun combat, Xenomorphs also have 10 armour_penetration per attack. 2015-06-18 20:36:36 +01:00
phil235 e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
MrPerson 9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2
Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi
2015-06-09 03:23:18 -07:00
Cheridan 6c12887367 Pressure_resistance Tweaks
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
2015-06-03 23:22:25 -05:00
Incoming 061478165a upgrades the HARDFEET species flag to PIERCEIMMUNE
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
2015-05-31 18:54:30 -04:00
Cheridan 10f2b7ae00 Merge pull request #9559 from xxalpha/cardtrick
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
phil235 ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
xxalpha adccdd38e9 Made a proc and fixed other buggy items. 2015-05-19 00:28:15 +01:00
Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
Resolves #1358, /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Firecage e80e08d552 Allows you to pick up stuff with the verb while buckled. 2015-05-05 15:54:49 +02:00
Jordie0608 e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10:00
Jordie 3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie 4da4d09ffb Merge pull request #9190 from phil235/XenoManipFix
Xenomorphs with has_fine_manipulation  can now pick up even big items
2015-04-28 23:48:46 +10:00
phil235 de7724f8d4 Xenomorphs with has_fine_manipulation (admin var edit only) can now pick up even big items of w_class 4 and 5. 2015-04-26 21:59:12 +02:00
GunHog 3ed9dc50bc Acid_Act() fix
acid_act() now respects the unacidable flag for items exposed to acid,
but are not worn on a mob.
2015-04-26 02:29:04 -05:00
phil235 9132838420 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/objects/items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02: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 d6cc2c07c6 Fix mmi deafened indefinitely. 9078
Fix carp knocking borg. 7394
Replace carp knockdown by stamina dmg (for human only) (now 5 bites instead of 7 to go from 100% to crit w/o armor) 7905
Fix being stunned as a borg causing temporary blindness, deafness and muteness. 9061
Change robot out of power: now only stunned, can talk but not move or interact. Adding feedback in examine. 6170
Robots now take damage in the hottest of inferno (35,000+ K)  8840
Nerfs uranium wall radiation: 6 times less radiation (just double the effect of urafloor), chain reaction range down to 1. 6841
Fixes putting braindead/notincorpse/ghosted brains in mmi, and same for mmi in borgs, the action fails and sends a message to the ghost. 4841 7447
Fixes brains taking eye damage and becoming blind. 6039
2015-04-21 23:35:12 +02:00
MrPerson 8f0cda1afa More screen alerts
High (uses "Hallucinating" icon), blind, embedded objects, asleep, weightlessness, new law (silicons), hacked (cyborgs), and locked down (cyborgs). The new law alert times out on its own after 30 seconds. The code for timing out is rough but works.

Sprites are provided by ZyloWalsh and can be seen at https://tgstation13.org/phpBB/viewtopic.php?f=11&t=3167
Drunk isn't in atm because I was waiting on phil to finish some reagent stuff. Hallu kind of ruined the "surprise" so I decided not to use it. Weaken/stun/paralysis are also not in right now because I'm lazy. All the sprites are included even if they're unused.

Added a proc human/has_embedded_objects() that returns 1 if src has any objects embedded in any limbs.
2015-04-18 16:54:36 -07:00
Jordie e6143f6493 Merge pull request #8810 from AnturK/everybodywaskungfufighting
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
AnturK 260d205598 - Adds Martial Art datum and Three styles 2015-04-11 16:32:20 +02:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235 92b0f9f4cd Adding a changelog.
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
Jordie 9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Miauw 1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan 52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan 72f465c864 Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Remie Richards 2d70141cd8 Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from. 2015-03-03 20:23:26 +00:00
Remie Richards 1e8324c3c5 Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object. 2015-02-26 17:04:00 +00:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +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
Remie Richards d519de5018 Added embedded items to self examining. Allows embedded items to be removed from yourself via links in self examining, this hurts. Adds can_embed(). Reworks help_shake_act(). 2015-02-14 01:31:40 +00:00
Remie Richards ab754b6182 Corrects all spellings of Embedds --> Embeds 2015-02-13 13:15:20 +00:00
Remie Richards 34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
paprka a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00