Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

This commit is contained in:
AffectedArc07
2021-07-09 11:42:23 +01:00
210 changed files with 1803 additions and 2434 deletions
@@ -28,6 +28,7 @@
/datum/rep_purchase/item/pinpointer,
/datum/rep_purchase/item/baton,
/datum/rep_purchase/item/fulton,
/datum/rep_purchase/item/flare,
/datum/rep_purchase/blackout,
/datum/rep_purchase/item/zippo,
/datum/rep_purchase/item/balloon,
@@ -0,0 +1,9 @@
/**
* # Rep Purchase - Emergency escape flare
*/
/datum/rep_purchase/item/flare
name = "Emergency extraction kit"
description = "A kit that comes with an emergency escape flare, which will allow you to teleport to any beacon after a short activation delay. Also comes with a Syndicate teleporter beacon that only these flares and emagged teleporters can target."
cost = 2
stock = 3
item_type = /obj/item/storage/box/syndie_kit/escape_flare
@@ -363,6 +363,9 @@
// Greys get to keep their implant
if(isgrey(H) && istype(I, /obj/item/organ/internal/cyberimp/brain/speech_translator))
continue
// IPCs keep this implant, free of charge!
if(ismachineperson(H) && istype(I, /obj/item/organ/internal/cyberimp/arm/power_cord))
continue
// Try removing it
I = I.remove(H)
if(I)