-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel
Conflicts:
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/secbot.dm
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now
I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
code/game/jobs/access.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/security.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/secbot.dm
code/modules/admin/verbs/debug.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/monkey/monkey.dm
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
Conflicts:
maps/tgstation2.dmm
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
Conflicts:
code/controllers/master_controller.dm
code/controllers/verbs.dm
code/game/supplyshuttle.dm
code/modules/shuttles/shuttle.dm
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine
Conflicts:
code/modules/vehicles/cargo_train.dm
code/modules/vehicles/train.dm
code/modules/vehicles/vehicle.dm
icons/obj/vehicles.dmi
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Conflicts:
code/ZAS/Fire.dm
code/modules/reagents/Chemistry-Reagents.dm
Citalopram now functions as an antipsychotic, reducing hallucinations. 1
unit will counter 1u of mindbreaker, but not remove it - synaptazine for
that.
New global list, "clothing_list".
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Conflicts:
code/__HELPERS/global_lists.dm
code/modules/clothing/clothing.dm
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/robot/component.dm
