Commit Graph
46 Commits
Author SHA1 Message Date
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
SadhorizonandGitHub acdeedd178 hydrocoat (#21821) 2023-07-27 15:55:04 +01:00
SadhorizonandGitHub db7524a724 Adds four new labcoats (#21212)
* added missing labcoats

* robo lockers
forgot that they spawn with labcoats too

* Forgot to remove the WIP sprites

* sean's review
2023-06-05 12:08:21 +01:00
DGamerLandGitHub 173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
VizandGitHub 949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01:00
variableundefinedandGitHub fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
00dedfe6a9 Swiftly sanction Sabre's systematic suggestions
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-21 12:57:24 +02:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
1e9ed4c648 Let's labcoats store cyborg analyzers. (#16246)
* Update labcoat.dm

* Update code/modules/clothing/suits/labcoat.dm

Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: meow20 <meow20@onet.pl>
Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
2021-06-29 11:34:26 +01:00
E-MonaRhgandGitHub 6d06dc97a4 Clothing grammar tweaks and the such (#15761)
* Clothing grammar and the such

* Made the PR more \improper and other stuff

* Suggested stuff

* Removed 's where it made sense

There are more most likely
2021-03-30 12:27:55 +01:00
Fox McCloudandGitHub faecf7cbfa Patch rework (#13062)
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
2020-05-02 20:07:43 -04:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloudandvariableundefined d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Mark van Alphen 90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Aurorablade 2524f56928 urgh so many 2017-05-07 02:01:08 -04:00
Tigercat2000 56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
Mieszko Jędrzejczak 5745099842 birb. 2016-07-09 11:24:00 +02:00
Mieszko Jędrzejczak 8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
KasparoVy d476516f88 Vox-compatibility for Most Suits, Fixes Reactive Armour Icon Update Bug
Also adds hiding tails by-species. Updates captain space-suit helmet hair-hiding code.
Fixes a bug where Reactive Armour's sprite wouldn't update when you turned it on or off.
Adds species-fitting for clothing accessories.
Adds the ability to open and close the Clown Officer and Soldier coats.

Adds Vox sprites for the following suits and accessories:
Unathi robe, unathi mantle, all ERT armour (not the spacesuits), armour vest, reflective armour vest,
Security armour vest, bulletproof armour vest, Detective armour vest, blueshield armour vest, combat armour vest,
laser tag vests, ian shirt, suspenders, waistcoat, vest, first responder jacket, bomber jacket, security bomber jacket,
black suit jacket, blue suit jacket, purple suit jacket, IAA jacket, NT Rep jacket, forensics jackets, overalls,
captain's carapace, Blueshield coat, trenchcoats, pirate and old pirate coats, HoS coat, HoS trenchcoat, Warden's jackets,
leather jacket, all military jackets, all ponchos, hazard vest, brigphys vest, reactive armour, riot/swat armour,
heavy armour, thunderdome armour, all knight armour, all bombsuits, regular and atmos firesuits, all biosuits, webbing,
clown officer coat, clown soldier coat.
2016-07-03 19:39:15 -04:00
Tigercat2000 ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
VampyrBytes 1148bde3a6 eating refactor (#3733) + bugfixes
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
KasparoVy b921c9a6c4 Redoes Redoing Suit Adjustment
@Regens1 for the special hulk joke. Haha?

Hulks can destroy jackets by trying to adjust them. In the case of labcoats, when you destroy it items in the pockets (not just the suit storage slot) will be dumped on the ground below you. Stuff in the suit storage slot already got dumped on the ground, so it didn't need any special treatment.

Fixes all known issues with any adjustable jackets using the wrong sprites, including the HoS jacket

Fixes #3707 and #3703. You can now adjust breath masks while buckled into beds or chairs.

Adds Missing Red Labcoat Sprites (found copies @ the Polaris repository).

Adds Blueshield coat in_hand icons
2016-03-02 03:08:05 -05:00
KasparoVy 447c3ea779 Default states and cull 2016-02-25 00:48:52 -05:00
KasparoVy aa7de9bb9a Woops. 2016-02-24 23:42:18 -05:00
KasparoVy 5c5bf92d87 Adds opening/closing of bomber jackets, adds Security bomber jacket. IAA jacket is closed by default now. Replaces bomber jacket with Security bomber jacket on the Pod Pilot's table. Refactors jacket adjustment. Grammar fixes. 2016-02-19 12:05:31 -05:00
Fox-McCloud d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00
Artorp 789adac9c3 - Antibody scanner added to suit slots
Antibody scanner added wherever the health analyzer went
2015-02-06 15:07:48 +01:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Markolie 19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Markolie 6cfea53224 The Mortician's labcoat can now be (un)buttoned 2014-11-26 23:43:50 +01:00
Markolie 7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00
ErthiloandZomgPonies 6443216183 More Vox clothing. Head and eyes this time.
Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi
2014-06-15 06:51:14 -04:00
ErthiloandZomgPonies dfce6736fb Tons more vox clothes.
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/suits/labcoat.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/mask.dmi
	icons/mob/species/vox/masks.dmi
	icons/mob/species/vox/shoes.dmi
	icons/mob/species/vox/uniform.dmi
2014-06-08 18:13:22 -04:00
Segrain a5766cbf29 Minor tweaks to medical clothes to match descriptions. 2013-06-02 23:07:25 +03:00
Chinsky 24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
aranclanos@hotmail.com 0e589d575c Fixes Issue 1066 - Suits having a wrong blood overlay.
I added a new var for suits, blood_overlay_type.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5024 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 09:29:40 +00:00
baloh.matevz 530c5c804a - Yet another issue that needed fixing resulted in the entire system having to be rewritten. Fixes issue 44, Fixes issue 690.
New defines in setup.dm:

This revision changes the following things:
- Hot is no longer defined as 'higher temperature than 310.15K' but is defined as 'higher temperature than my body temperature'. The opposite applies for cold.
- Removed heat_transfer_coefficient and protective_temperature
- Added heat_protection and cold_protection flag variables to obj/item, which define which areas of your body are protected from heat.
- Added max_heat_protection_temperature and min_cold_protection_temperature which define up to which temperature the item protects when worn (NOTE that it only protects on the locations specified by the heat_protection flags!) and down to which temperature it protects from the cold.
- REMEMBER! hot and cold were redefined to mean 'which way your body temperature should be moving based on the air around you'.
- Each tick, your body now 'corrects' your body temperature towards 310.15K which is the ideal temperature. The correction is max( difference/12, 10 ), so either a twelfth of the difference between your body temperature and 310.15K, or 10K, whichever is higher. This ensures your body temperature stabilizes over time.
- Most notable changes in the amount of protection you get from common items are these: Space suits now ONLY protect from cold and fire suits now ONLY protect from heat. Now what this means is obviously that firesuits will be useless in space, but also that if you find yourself in a fire with a high body temperature and you put a firesuit on, your temperature will no longer stagnate at the high temperature, due to temperature not going up nor down, but rather it will get lower. Instead it will be protected from rising, it will however gradually get lowered by your body's 'auto-correct' attempts, as described in the last point. Additionally, if you wear a fire suit and enter an area with a good temperature (for isntance 290K) and you have a high body temperature, due to just escaping from a fire, the fire suit will not make your body temperature stagnate. Because it does not protect you from cold, and cold being defined as 'colder than your body temperature', you will actually successfully cool down to the optimal temperature.
- The opposite applies to space suits. They protect from cold and don't protect from heat. If you find yourself in space and your temperature drops and put on the space suit with your temperature still low, you will recover over time. If you enter an area with a good temperature, you will recover faster, since the space suit does not protect you from heat.
- In short, space suits are now better at dealing with space and fire suits are better at dealing with fires.
- You will NEED a fire helmet to be protected from heat and you will NEED a space suit helmet to be protected from cold. There is no 'but'. Fire helmets are red or white hardhats, found in all fire closets.
- The 'heat up' coefficients are defined in setup.dm, they are:
- - head = 30%
- - lower and upper torso = 15% each = 30%
- - legs and arms = 7.5% each = 30%
- - feet and hands = 2.5% each = 10%
- Gloves cover hands
- Shoes cover feet
- Space-worthy jumpsuits cover legs, arms, upper and lower torso
- Space suits cover legs, arms, hands, feet, upper and lower torso
- Headgear covers heads
- Removed the HEADSPACE and SUITSPACE flags, due to being moved to the new variables. This frees up the flag value 4.
. The amount of damage heated gas and heated areas do can now be set in human/life.dm. The values are: (The different levels are based on breath temperature or body temperature.)

#define HEAT_DAMAGE_LEVEL_1 2
#define HEAT_DAMAGE_LEVEL_2 4
#define HEAT_DAMAGE_LEVEL_3 8

#define COLD_DAMAGE_LEVEL_1 1
#define COLD_DAMAGE_LEVEL_2 2
#define COLD_DAMAGE_LEVEL_3 4

//Note that gas heat damage is only applied once every FOUR ticks.
#define HEAT_GAS_DAMAGE_LEVEL_1 2
#define HEAT_GAS_DAMAGE_LEVEL_2 4
#define HEAT_GAS_DAMAGE_LEVEL_3 8

#define COLD_GAS_DAMAGE_LEVEL_1 1
#define COLD_GAS_DAMAGE_LEVEL_2 2
#define COLD_GAS_DAMAGE_LEVEL_3 4

The speed at which your body temperature raises or falls can be altered with the following defines: 

#define BODYTEMP_AUTORECOVERY_DIVISOR 12 
#define BODYTEMP_AUTORECOVERY_MINIMUM 10
#define BODYTEMP_COLD_DIVISOR 6
#define BODYTEMP_HEAT_DIVISOR 6

The divisors determins by how big a difference between your body temperature and the surrounding air (or 310.15 in the case of autorecovery) will your body temperature change. The autorecovery_minimum means what the minimum recovery is, if difference / 12 is less than 10, it will recover by 10.


Was all this needed to fix Issue 44? Yes..... yes... it was... Some things are consequences of decisions made while fixing it, but all of it was necessary to completely fix the issue. I found it did not remain on the tracker for this long for nothing.

I'm sorry for the essay, but there was a lot of work involved and a lot of changes happened, so I had to write a lot...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4428 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 02:48:49 +00:00
johnsonmt88@gmail.com e9671308bf Reorganized clothing as a whole.
Everything related to clothing should now be defined in modules/clothing. I'm almost certain there's clothing code hidden elsewhere but this should be the vast majority of it finished.

Everything is set up related to the object types themselves (meaning paths.)
So all hats will be in modules/clothing/head, all gloves will be in modules/clothing/gloves, ect...

I've removed 'modules/clothing/random.dm' and 'objects/items/clothing.dm' which both seemed to just be a place where people would put stuff they were too lazy to find a proper home for.

I've also moved files that had no, or very few blocks of code into more catagorized areas.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-13 02:17:14 +00:00
mport2004@gmail.com c86c8e1505 Finished moving the clothes in defines over to modules.
Several head objects path changed so they are not helmets, head means can fit on your head, helmet was securities helmets, space helmets currently still helmet.
Cult restricted job list now has the sec force + cap because you can’t convert them as is.
AI removed from protected traitor jobs as malf is currently effectively out of commission.
A Protected list was added to changling.
Removed the furry mob files that were not checked.
Moved two unchecked files to unused


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 19:25:01 +00:00
mport2004@gmail.com ec507d8277 Anything that used the updateappearance proc will no longer update hair/beards. The things that use it are DNA changes, Cloned mobs, Changlings. The proc was runtiming due code on lines 234 and 246, I looked into it a bit but don't currently know how to fix it. The proc is currently commented out so at least the skin color/body updates properly.
Thanks to Exadv1 the reagent checking code for chem got a nice performance tweak.
Minor text change to the steal ai objective.
Few runtimes/nullchecks fixed.
HoS does not spawn with a flash, Warden does not spawn with a taser, Security officers now spawn with a flash.
Wizarditis has been uncommented and nerffed quite a bit.
Moved most of the suits over to the clothing module folder.
Force 0 items won't damage humans.
The two lockboxes have been readded to the armory.
The brigs extra large power cell has been cut in half. (still twice as large as normal apcs)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2480 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 12:14:39 +00:00