Merge remote-tracking branch 'upstream/master'

ModularTegustation/fishing/code/fish_market.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/money_machine.dmi'
 	icon_state = "bogdanoff"
 	density = TRUE
+	resistance_flags = INDESTRUCTIBLE
 	var/fish_points = 0
 
 	var/list/order_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.

ModularTegustation/tegu_items/gadgets/manager_bullets.dm

@@ -46,20 +46,6 @@
 /datum/status_effect/interventionshield/on_apply()
 	. = ..()
 	owner.add_overlay(statuseffectvisual)
-	var/mob/living/carbon/human/L = owner
-	switch(respectivedamage)
-		if(RED_DAMAGE)
-			inherentarmorcheck = L.physiology.red_mod
-			L.physiology.red_mod *= 0.0001
-		if(WHITE_DAMAGE)
-			inherentarmorcheck = L.physiology.white_mod
-			L.physiology.white_mod *= 0.0001
-		if(BLACK_DAMAGE)
-			inherentarmorcheck = L.physiology.black_mod
-			L.physiology.black_mod *= 0.0001
-		if(PALE_DAMAGE)
-			inherentarmorcheck = L.physiology.pale_mod
-			L.physiology.pale_mod *= 0.0001
 	owner.visible_message("<span class='notice'>[owner]s shield activates!</span>")
 	RegisterSignal(owner, COMSIG_MOB_APPLY_DAMGE, .proc/OnApplyDamage) //stolen from caluan
 	RegisterSignal(owner, COMSIG_WORK_STARTED, .proc/Destroy)
@@ -68,60 +54,38 @@
 	SIGNAL_HANDLER
 	if(damagetype != respectivedamage)
 		return
+
 	var/mob/living/carbon/human/H = owner
 	var/suitarmor = H.getarmor(null, respectivedamage) / 100
-	var/suit = owner.get_item_by_slot(ITEM_SLOT_OCLOTHING)
 	damagetaken = amount * (1 - suitarmor)
 	if(damagetaken <= 0)
 		return
-	if(!suit)
-		damagetaken = amount
+
 	if(damagetaken <= shieldhealth)
 		shieldhealth = shieldhealth - damagetaken
 		amount = 0
 		var/shielddiagnostics = shieldhealth / 100
 		if(shielddiagnostics < 0.95 && faltering != 1)
 			faltering = 1
-		return
+		return COMPONENT_MOB_DENY_DAMAGE // This return value completely negates the apply_damage proc
 	if(damagetaken >= shieldhealth && faltering != 1) //When you prep a shield before a big attack.
 		amount = 0
 		owner.visible_message("<span class='warning'>The shield around [owner] focuses all its energy on absorbing the damage.</span>")
 		duration = 1 SECONDS
-	else
-		qdel(src)
+		return COMPONENT_MOB_DENY_DAMAGE
+	qdel(src)
 	return
 
 /datum/status_effect/interventionshield/be_replaced()
-	var/mob/living/carbon/human/L = owner
-	if(!istype(L))
-		return ..()
-	switch(respectivedamage)
-		if(RED_DAMAGE)
-			L.physiology.red_mod /= 0.0001
-		if(WHITE_DAMAGE)
-			L.physiology.white_mod /= 0.0001
-		if(BLACK_DAMAGE)
-			L.physiology.black_mod /= 0.0001
-		if(PALE_DAMAGE)
-			L.physiology.pale_mod /= 0.0001
 	playsound(get_turf(owner), 'sound/effects/glassbr1.ogg', 50, 0, 10)
 	return ..()
 
 /datum/status_effect/interventionshield/on_remove()
-	var/mob/living/carbon/human/L = owner
-	switch(respectivedamage)
-		if(RED_DAMAGE)
-			L.physiology.red_mod /= 0.0001
-		if(WHITE_DAMAGE)
-			L.physiology.white_mod /= 0.0001
-		if(BLACK_DAMAGE)
-			L.physiology.black_mod /= 0.0001
-		if(PALE_DAMAGE)
-			L.physiology.pale_mod /= 0.0001
 	owner.cut_overlay(statuseffectvisual)
 	owner.visible_message("<span class='warning'>The shield around [owner] shatters!</span>")
 	playsound(get_turf(owner), 'sound/effects/glassbr1.ogg', 50, 0, 10)
 	UnregisterSignal(owner, COMSIG_MOB_APPLY_DAMGE)
+	UnregisterSignal(owner, COMSIG_WORK_STARTED)
 	return ..()
 
 /datum/status_effect/interventionshield/white

ModularTegustation/tegu_items/representative/console.dm

@@ -176,8 +176,8 @@
 			order_list = list(
 				new /datum/data/extraction_cargo("L Corp Regeneration Augmentation Kit", /obj/item/safety_kit, 400, L_CORP_REP) = 1,
 				new /datum/data/extraction_cargo("L Corp Slowing Trap Generator", /obj/item/powered_gadget/slowingtrapmk1, 400, L_CORP_REP) = 1,
-				new /datum/data/extraction_cargo("L Corp Vitals Projector", /obj/item/powered_gadget/clerkbot_gadget, 400, L_CORP_REP) = 1,
-				new /datum/data/extraction_cargo("L Corp Clerkbot Kit", /obj/item/powered_gadget/slowingtrapmk1, 400, L_CORP_REP) = 1,
+				new /datum/data/extraction_cargo("L Corp Vitals Projector", /obj/item/powered_gadget/vitals_projector, 400, L_CORP_REP) = 1,
+				new /datum/data/extraction_cargo("L Corp Clerkbot Kit", /obj/item/powered_gadget/clerkbot_gadget, 400, L_CORP_REP) = 1,
 				new /datum/data/extraction_cargo("L Corp Taser", /obj/item/powered_gadget/handheld_taser, 700, L_CORP_REP) = 1,
 				)
 

ModularTegustation/tegu_items/representative/items/pcorp.dm

@@ -1,3 +1,4 @@
+//Crates
 /obj/structure/closet/crate/pcorp
 	name = "P-Corp quik tm crate"
 	drag_slowdown = -0.2
@@ -18,6 +19,7 @@
 	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
 	pickup_sound =  'sound/items/handling/toolbelt_pickup.ogg'
 	w_class = WEIGHT_CLASS_BULKY
+	drag_slowdown = 1
 
 /obj/item/storage/belt/egopcorp/ComponentInitialize()
 	. = ..()
@@ -41,6 +43,7 @@
 	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
 	pickup_sound =  'sound/items/handling/toolbelt_pickup.ogg'
 	w_class = WEIGHT_CLASS_BULKY
+	drag_slowdown = 1
 
 /obj/item/storage/belt/egoarmor/ComponentInitialize()
 	. = ..()
@@ -58,7 +61,8 @@
 	desc = "You wear this on your back and put items into it. Holds 3 of any bulky item. Slows you down slightly."
 	icon_state = "duffel-drone"
 	inhand_icon_state = "duffel-drone"
-	slowdown = 0.5
+	slowdown = 0.1
+	drag_slowdown = 1
 
 /obj/item/storage/backpack/pcorp/ComponentInitialize()
 	. = ..()
@@ -72,11 +76,50 @@
 	desc = "You wear this on your back and put items into it. Holds 5 of any bulky item. Slows you down."
 	icon_state = "holdingpack"
 	inhand_icon_state = "holdingpack"
-	slowdown = 1
+	slowdown = 0.25
+	drag_slowdown = 1
 
 /obj/item/storage/backpack/pcorpheavy/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_combined_w_class = 50
 	STR.max_w_class = WEIGHT_CLASS_BULKY
 	STR.max_items = 5
+
+//Pouches
+/obj/item/storage/pcorp_pocket
+	name = "P-Corp Deep Pocket"
+	desc = "Put onto your pocket to hold any 4 small items."
+	icon_state = "ppouch"
+	inhand_icon_state = "ppouch"
+	slot_flags = ITEM_SLOT_POCKETS
+	resistance_flags = NONE
+	max_integrity = 300
+
+/obj/item/storage/pcorp_pocket/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 21
+	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.max_items = 4
+
+
+//Pouches
+/obj/item/storage/pcorp_weapon
+	name = "P-Corp Small Weapon Holster"
+	desc = "Put onto your pocket to hold any small EGO weapon."
+	icon_state = "pweapon"
+	inhand_icon_state = "pweapon"
+	slot_flags = ITEM_SLOT_POCKETS
+	resistance_flags = NONE
+	max_integrity = 300
+
+/obj/item/storage/pcorp_weapon/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 1
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.max_combined_w_class = 32
+	STR.set_holdable(GLOB.small_ego)
+
+

ModularTegustation/tegu_items/representative/research/kcorp.dm

@@ -1,4 +1,3 @@
-
 //-----K_CORP-----
 //K Corp sells mostly healing gear.
 ///Healing Items Line

ModularTegustation/tegu_items/representative/research/pcorp.dm

@@ -1,4 +1,3 @@
-
 //-----P_CORP-----
 //P Corp sells different storage items
 ///Backpack Items Line
@@ -51,6 +50,32 @@
 	..()
 
 
+//Pockets line
+/datum/data/lc13research/pocketpouch
+	research_name = "Repurchasable: P Corp Pouch (x2) "
+	research_desc = "Dear ambassador. We have new items for you! <br>A pocket extender for the LCorp agents. <br>Ship only to their best. "
+	cost = LOW_RESEARCH_PRICE
+	corp = P_CORP_REP
+	required_research = /datum/data/lc13research/pcorpbackpack
+
+/datum/data/lc13research/pocketpouch/ResearchEffect(obj/structure/representative_console/caller)
+	new /obj/item/storage/pcorp_pocket(get_turf(caller))
+	new /obj/item/storage/pcorp_pocket(get_turf(caller))
+
+/datum/data/lc13research/pocketpistol
+	research_name = "Repurchasable: P Corp Weapon Pouch (x2) "
+	research_desc = "Dear ambassador. We have new items for you! <br>A pocket extender for the LCorp agents that holds one small weapon. <br>Ship only to their best. "
+	cost = LOW_RESEARCH_PRICE
+	corp = P_CORP_REP
+	required_research = /datum/data/lc13research/pcorpbackpack
+
+/datum/data/lc13research/pocketpistol/ResearchEffect(obj/structure/representative_console/caller)
+	new /obj/item/storage/pcorp_weapon(get_turf(caller))
+	new /obj/item/storage/pcorp_weapon(get_turf(caller))
+
+
+
+//Funny Crate
 /datum/data/lc13research/crate
 	research_name = "P Corp Speed Crate (x2) "
 	research_desc = "Dear ambassador. We have new items for you! <br>A crate that speeds you up as you drag it! <br>We're 99% sure it won't explode but you know... <br> Can't make any better guarantees. "

ModularTegustation/tegu_items/representative/research/wcorp.dm

@@ -1,6 +1,6 @@
-
 //-----W_CORP-----
 //W-Corp has movement technology, and upgraded weapons.
+//They're very much a jack of all trades.
 
 /datum/data/lc13research/w_corp_typea
 	research_name = "W Corp Type A Weapons"
@@ -68,3 +68,30 @@
 	research_desc = "We've decided to ship out more of those Quantum Pads. You can have this set for the same price."
 	required_research = /datum/data/lc13research/teleporter
 
+
+//Fast Tiles
+/datum/data/lc13research/fasttiles
+	research_name = "Repurchasable: W-Corp High-Traction Tiles (x100)"
+	research_desc = "These have been rotting in our warehouse the last couple years. <br>Running on these should make you slightly faster, but we have no use for them."
+	cost = AVERAGE_RESEARCH_PRICE
+	corp = W_CORP_REP
+
+/datum/data/lc13research/fasttiles/ResearchEffect(obj/structure/representative_console/caller)
+	new /obj/item/stack/tile/noslip/fifty(get_turf(caller))
+	new /obj/item/stack/tile/noslip/fifty(get_turf(caller))
+
+/obj/item/stack/tile/noslip/fifty
+	amount = 50
+
+
+/datum/data/lc13research/bluespace
+	research_name = "Repurchasable: W-Corp Quick Tiles (30x)"
+	research_desc = "These have been rotting in our warehouse the last couple years. <br>Running on these should make you faster, but we have no use for them."
+	cost = AVERAGE_RESEARCH_PRICE
+	corp = W_CORP_REP
+
+/datum/data/lc13research/bluespace/ResearchEffect(obj/structure/representative_console/caller)
+	new /obj/item/stack/tile/bluespace/thirty(get_turf(caller))
+
+/obj/item/stack/tile/bluespace/thirty
+	amount = 30

ModularTegustation/tegu_items/representative/spawners.dm

@@ -88,7 +88,7 @@
 	flavour_text = "Your team is new to assisting L-Corp, you're just looking for that monthly bonus, and to skip 2 weeks of training. Fight out as long as you can."
 	mob_name = "Cleanup Agent"
 	outfit = /datum/outfit/wcorp
-	assignedrole = "L0"
+	assignedrole = "L1"
 	spawn_level = 40
 	faction = list("neutral", "wcorp")
 	icon_state = "Warp"