Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00
parent 5dc1de1d04 0cffb2e672
commit 8fbfd07692
1009 changed files with 20505 additions and 13193 deletions
@@ -315,10 +315,10 @@
 	var/is_anchored = FALSE
 	if(move_resist == MOVE_FORCE_OVERPOWERING)
 		move_resist = MOVE_FORCE_NORMAL
+		REMOVE_TRAIT(src, TRAIT_NO_TELEPORT, src)
 	else
 		is_anchored = TRUE
 		move_resist = MOVE_FORCE_OVERPOWERING
-		REMOVE_TRAIT(src, TRAIT_NO_TELEPORT, src)
 		ADD_TRAIT(src, TRAIT_NO_TELEPORT, src)

 	to_chat(src, "<b>You are now [is_anchored ? "" : "un"]anchored.</b>")
@@ -7,4 +7,7 @@
 		var/datum/antagonist/bloodsucker/V = mind.has_antag_datum(/datum/antagonist/bloodsucker)
 		if(V)
 			mind.remove_antag_datum(V)
+		var/datum/antagonist/gang/G = mind.has_antag_datum(/datum/antagonist/gang)
+		if(G)
+			mind.remove_antag_datum(G)
 	..()
@@ -2,7 +2,6 @@
 	name = "pAI"
 	icon = 'icons/mob/pai.dmi'
 	icon_state = "repairbot"
-	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	density = FALSE
 	pass_flags = PASSTABLE | PASSMOB
 	mob_size = MOB_SIZE_TINY
@@ -11,7 +10,8 @@
 	health = 500
 	maxHealth = 500
 	layer = BELOW_MOB_LAYER
-	can_be_held = TRUE
+	silicon_privileges = PRIVILEDGES_PAI
+	var/datum/element/mob_holder/current_mob_holder //because only a few of their chassis can be actually held.

 	var/network = "ss13"
 	var/obj/machinery/camera/current = null
@@ -64,9 +64,6 @@
 	var/list/possible_chassis			//initialized in initialize.
 	var/list/dynamic_chassis_icons		//ditto.
 	var/list/chassis_pixel_offsets_x	//stupid dogborgs
-	var/static/item_head_icon = 'icons/mob/pai_item_head.dmi'
-	var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi'
-	var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi'

 	var/emitterhealth = 20
 	var/emittermaxhealth = 20
@@ -77,7 +74,7 @@
 	var/emitteroverloadcd = 100

 	var/radio_short = FALSE
-	var/radio_short_cooldown = 5 MINUTES
+	var/radio_short_cooldown = 3 MINUTES
 	var/radio_short_timerid

 	canmove = FALSE
@@ -1,3 +1,4 @@
+#define PAI_EMP_SILENCE_DURATION 3 MINUTES

 /mob/living/silicon/pai/blob_act(obj/structure/blob/B)
 	return FALSE
@@ -8,7 +9,7 @@
 		return
 	take_holo_damage(50/severity)
 	Knockdown(400/severity)
-	silent = max((3 MINUTES)/severity, silent)
+	silent = max(silent, (PAI_EMP_SILENCE_DURATION) / SSmobs.wait / severity)
 	if(holoform)
 		fold_in(force = TRUE)
 	emitter_next_use = world.time + emitter_emp_cd
@@ -55,7 +56,8 @@
 	if(P.stun)
 		fold_in(force = TRUE)
 		visible_message("<span class='warning'>The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!</span>")
-	return ..()
+	. = ..()
+	return BULLET_ACT_FORCE_PIERCE

 /mob/living/silicon/pai/stripPanelUnequip(obj/item/what, mob/who, where) //prevents stripping
 	to_chat(src, "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>")
@@ -96,6 +96,12 @@
 			dynamic_chassis = choice
 	resist_a_rest(FALSE, TRUE)
 	update_icon()
+	if(possible_chassis[chassis])
+		current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD)
+	else
+		current_mob_holder?.Detach(src)
+		current_mob_holder = null
+		return
 	to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>")

 /mob/living/silicon/pai/lay_down()
@@ -117,19 +123,6 @@
 		set_light(0)
 		to_chat(src, "<span class='notice'>You disable your integrated light.</span>")

-/mob/living/silicon/pai/mob_pickup(mob/living/L)
-	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, chassis, item_head_icon, item_lh_icon, item_rh_icon)
-	if(!L.put_in_hands(holder))
-		qdel(holder)
-	else
-		L.visible_message("<span class='warning'>[L] scoops up [src]!</span>")
-
-/mob/living/silicon/pai/mob_try_pickup(mob/living/user)
-	if(!possible_chassis[chassis])
-		to_chat(user, "<span class='warning'>[src]'s current form isn't able to be carried!</span>")
-		return FALSE
-	return ..()
-
 /mob/living/silicon/pai/verb/toggle_chassis_sit()
 	set name = "Toggle Chassis Sit"
 	set category = "IC"
@@ -8,9 +8,9 @@
 		var/list/states = icon_states(icon)
 		icon_state = ""
 		if(resting)		//The next line is some bullshit but I can make it worse if you want and make it a single line instead of four.. :)
-			if(dynamic_chassis_sit && ("sit") in states)
+			if(dynamic_chassis_sit && ("sit" in states))
 				icon_state = "sit"
-			else if(dynamic_chassis_bellyup && ("bellyup") in states)
+			else if(dynamic_chassis_bellyup && ("bellyup" in states))
 				icon_state = "bellyup"
 			else if("rest" in states)
 				icon_state = "rest"
@@ -191,7 +191,7 @@
 		else if(istype(I, /obj/item/gun/energy))
 			var/obj/item/gun/energy/EG = I
 			if(EG.cell?.charge < EG.cell.maxcharge)
-				var/obj/item/ammo_casing/energy/S = EG.ammo_type[EG.select]
+				var/obj/item/ammo_casing/energy/S = EG.ammo_type[EG.current_firemode_index]
 				EG.cell.give(S.e_cost * coeff)
 				if(!EG.chambered)
 					EG.recharge_newshot(TRUE)
@@ -340,7 +340,7 @@
 /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
 	var/medmodels = list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot", "Medihound", "Medihound Dark", "Vale")
-	if(R.client && R.client.ckey in list("nezuli"))
+	if(R.client && (R.client.ckey in list("nezuli")))
 		medmodels += "Alina"
 	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in medmodels
 	if(!borg_icon)
@@ -437,7 +437,7 @@
 /obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
 	var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer", "Vale")
-	if(R.client && R.client.ckey in list("nezuli"))
+	if(R.client && (R.client.ckey in list("nezuli")))
 		engymodels += "Alina"
 	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels
 	if(!borg_icon)
@@ -515,7 +515,7 @@
 /obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
 	var/list/secmodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider", "K9", "K9 Dark", "Vale")
-	if(R.client && R.client.ckey in list("nezuli"))
+	if(R.client && (R.client.ckey in list("nezuli")))
 		secmodels += "Alina"
 	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in secmodels
 	if(!borg_icon)
@@ -596,8 +596,8 @@

 /obj/item/robot_module/peacekeeper/do_transform_animation()
 	..()
-	to_chat(loc, "<span class='userdanger'>Under ASIMOV/CREWSIMOV, you are an enforcer of the PEACE and preventer of HUMAN/CREW HARM. \
-	You are not a security module and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.</span>")
+	to_chat(loc, "<span class='userdanger'>Under ASIMOV/CREWSIMOV, you are an enforcer of the PEACE. \
+	You are not a security module and you are expected to follow orders to the best of your abilities without causing harm. Space law means nothing to you.</span>")

 /obj/item/robot_module/peacekeeper/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
@@ -1,6 +1,6 @@
 /mob/living/silicon
 	gender = NEUTER
-	has_unlimited_silicon_privilege = 1
+	silicon_privileges = PRIVILEDGES_SILICON
 	verb_say = "states"
 	verb_ask = "queries"
 	verb_exclaim = "declares"
@@ -10,7 +10,7 @@
 	bubble_icon = "machine"
 	weather_immunities = list("ash")
 	possible_a_intents = list(INTENT_HELP, INTENT_HARM)
-	mob_biotypes = list(MOB_ROBOTIC)
+	mob_biotypes = MOB_ROBOTIC
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 	speech_span = SPAN_ROBOT
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1