Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
Conflicts:
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/material/kitchen.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
- Industrial Hardsuit RCD removed
- Single Action figure added to the vacant shop.
- Comfort creature added to the psych office.
- Piping underneath the holodeck control doors removed.
- Firelocks along the fore part of the central ring now glasslocks
- Air Alarms added to the cyborg station, upload foyer, messaging server room.
- Light switch, fire alarm radio, and air alarm added to secondary tool storage.
- Coffee shop shutters and door properly labeled.
- Status display added to the IA office.
- Second photo album added to the detective’s office.
- Removed forgotten items on mining z-level. I.E. I screwed up.
- Atmos backwards pumps should be fixed and sorted.
- Distro and waste lines tweaked in atmos.
- Crowbars should now be dispensed from oxy wall lockers.
- Tweaked the variables on the outpost SMES units. New SMES added to the mining engineering outpost.
- Pill cabinets added to the medbay at central.
- Mulebots should have proper access now.
- Overhaul to parts of the mining z-level. Fixed several issues brought up.
- Spoons added to the cafeteria
- One extra ERT suit for each role added to the ERT area.
- New item, combat knife. Should be robustier than the tactical knife. Available for ERT and two for the mercs.
- New item, marine boots. Basically just renamed jackboots at the moment.
- Tactical Knives and combat knives can now be put into swat boots and marine boots. Depending on how well the feature works will be expanded to include other boots.
