fun fact: I'm never porting say-related stuff from bay.
Conflicts:
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/radio/headset.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
Added damage to spacepods as well as damage overlays.
Started a framework to allow more than 1 weapon system per spacepod.
Pods turn into fireworks when they reach 0 integrity.
Conflicts:
code/WorkInProgress/pomf/spacepods/spacepods.dm
html/changelog.html
a non-damaged drone has 35 health and 35 maxHealth.
in the current proc, that is shown as (( 35 +35)/(35*2))*100 = 100 % health
a drone at half its health has 17.5 health.
current proc : (( 17.5 +35)/(35*2))*100 = 75 % health
a dead drone has 0 health.
current proc : ( 0 +35)/(35*2))*100 = 50 % health
as i fixed this proc in the silicon parent proc, this can be removed.
a non-damaged cyborg has 200 health.
in the current proc, that is shown as (200+100)/2 = 150 % health
a dead borg has 0 health.
in the current proc, that is shown as (0+100)/2 = 50 % health
Conflicts:
code/modules/mob/living/silicon/silicon.dm
-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
