mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 05:57:24 +01:00
Refactors Corgis
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
|
||||
var/ks1type = null
|
||||
var/ks2type = null
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/radio/headset/New()
|
||||
..()
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
var/circuitry_installed = 1
|
||||
var/last_tick //used to delay the powercheck
|
||||
var/buildstage = 0
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/radio/intercom/custom
|
||||
name = "station intercom (Custom)"
|
||||
|
||||
@@ -22,6 +22,7 @@ var/global/list/default_medbay_channels = list(
|
||||
/obj/item/radio
|
||||
icon = 'icons/obj/radio.dmi'
|
||||
name = "station bounced radio"
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
suffix = "\[3\]"
|
||||
icon_state = "walkietalkie"
|
||||
item_state = "walkietalkie"
|
||||
@@ -396,7 +397,7 @@ var/global/list/default_medbay_channels = list(
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
displayname = H.voice
|
||||
if(H.voice != real_name)
|
||||
if(H.voice != real_name)
|
||||
voicemask = TRUE
|
||||
|
||||
if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)
|
||||
@@ -653,6 +654,7 @@ var/global/list/default_medbay_channels = list(
|
||||
icon_state = "radio"
|
||||
canhear_range = 0
|
||||
subspace_transmission = 1
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/radio/borg/syndicate
|
||||
keyslot = new /obj/item/encryptionkey/syndicate/nukeops
|
||||
@@ -840,6 +842,7 @@ var/global/list/default_medbay_channels = list(
|
||||
|
||||
/obj/item/radio/off
|
||||
listening = 0
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
|
||||
/obj/item/radio/phone
|
||||
broadcasting = 0
|
||||
@@ -847,6 +850,7 @@ var/global/list/default_medbay_channels = list(
|
||||
icon_state = "red_phone"
|
||||
listening = 1
|
||||
name = "phone"
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/radio/phone/medbay
|
||||
frequency = MED_I_FREQ
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
container_type = AMOUNT_VISIBLE
|
||||
materials = list(MAT_METAL=90)
|
||||
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
var/max_water = 50
|
||||
var/last_use = 1.0
|
||||
var/safety = 1
|
||||
@@ -35,6 +36,7 @@
|
||||
materials = list()
|
||||
max_water = 30
|
||||
sprite_name = "miniFE"
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/extinguisher/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
/obj/item/grenade/clusterbuster/fluffy
|
||||
name = "Fluffy Love Bomb"
|
||||
desc = "Exactly as snuggly as it sounds."
|
||||
payload = /mob/living/simple_animal/pet/corgi/puppy
|
||||
payload = /mob/living/simple_animal/pet/dog/corgi/puppy
|
||||
|
||||
/obj/item/grenade/clusterbuster/fox
|
||||
name = "Troublemaking Grenade"
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
desc = "A tank of oxygen."
|
||||
icon_state = "oxygen"
|
||||
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
|
||||
|
||||
/obj/item/tank/oxygen/New()
|
||||
@@ -34,10 +35,12 @@ obj/item/tank/oxygen/empty/New()
|
||||
/obj/item/tank/oxygen/yellow
|
||||
desc = "A tank of oxygen, this one is yellow."
|
||||
icon_state = "oxygen_f"
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/tank/oxygen/red
|
||||
desc = "A tank of oxygen, this one is red."
|
||||
icon_state = "oxygen_fr"
|
||||
dog_fashion = null
|
||||
|
||||
|
||||
/*
|
||||
@@ -67,6 +70,7 @@ obj/item/tank/oxygen/empty/New()
|
||||
desc = "Mixed anyone?"
|
||||
icon_state = "air"
|
||||
item_state = "air"
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
|
||||
/obj/item/tank/air/examine(mob/user)
|
||||
if(..(user, 0))
|
||||
|
||||
Reference in New Issue
Block a user