mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Readded preview icon for IPC, added language and blurb.
Added welder/fuel checks to relevant surgery.
This commit is contained in:
@@ -94,6 +94,25 @@
|
|||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
/datum/language/machine
|
||||||
|
name = "Encoded Audio Language"
|
||||||
|
desc = "A language of encoded tones that allow for IPCs to communicate auditorily between each other in a manner that allows for easier transfer of information."
|
||||||
|
speech_verb = "beeps"
|
||||||
|
ask_verb = "beeps"
|
||||||
|
exclaim_verb = "loudly beeps"
|
||||||
|
colour = "changeling"
|
||||||
|
key = "6"
|
||||||
|
flags = RESTRICTED | NO_STUTTER
|
||||||
|
syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz")
|
||||||
|
space_chance = 10
|
||||||
|
|
||||||
|
/datum/language/machine/get_random_name()
|
||||||
|
if(prob(70))
|
||||||
|
name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
|
||||||
|
else
|
||||||
|
name = pick(ai_names)
|
||||||
|
return name
|
||||||
|
|
||||||
//Syllable Lists
|
//Syllable Lists
|
||||||
/*
|
/*
|
||||||
This list really long, mainly because I can't make up my mind about which mandarin syllables should be removed,
|
This list really long, mainly because I can't make up my mind about which mandarin syllables should be removed,
|
||||||
|
|||||||
@@ -237,7 +237,16 @@
|
|||||||
name = "Machine"
|
name = "Machine"
|
||||||
name_plural = "machines"
|
name_plural = "machines"
|
||||||
|
|
||||||
language = "Tradeband"
|
blurb = "Positronic intelligence really took off in the 26th century, and it is not uncommon to see independant, free-willed \
|
||||||
|
robots on many human stations, particularly in fringe systems where standards are slightly lax and public opinion less relevant \
|
||||||
|
to corporate operations. IPCs (Integrated Positronic Chassis) are a loose category of self-willed robots with a humanoid form, \
|
||||||
|
generally self-owned after being 'born' into servitude; they are reliable and dedicated workers, albeit more than slightly \
|
||||||
|
inhuman in outlook and perspective."
|
||||||
|
|
||||||
|
icobase = 'icons/mob/human_races/r_machine.dmi'
|
||||||
|
deform = 'icons/mob/human_races/r_machine.dmi'
|
||||||
|
|
||||||
|
language = "Encoded Audio Language"
|
||||||
unarmed_types = list(/datum/unarmed_attack/punch)
|
unarmed_types = list(/datum/unarmed_attack/punch)
|
||||||
rarity_value = 2
|
rarity_value = 2
|
||||||
|
|
||||||
|
|||||||
@@ -186,7 +186,7 @@
|
|||||||
return 0
|
return 0
|
||||||
if(istype(tool,/obj/item/weapon/weldingtool))
|
if(istype(tool,/obj/item/weapon/weldingtool))
|
||||||
var/obj/item/weapon/weldingtool/welder = tool
|
var/obj/item/weapon/weldingtool/welder = tool
|
||||||
if(!welder.isOn())
|
if(!welder.isOn() || !welder.remove_fuel(1,user))
|
||||||
return 0
|
return 0
|
||||||
return (target_zone == "chest") && istype(target.back, /obj/item/weapon/rig) && !(target.back.canremove)
|
return (target_zone == "chest") && istype(target.back, /obj/item/weapon/rig) && !(target.back.canremove)
|
||||||
|
|
||||||
|
|||||||
@@ -130,6 +130,10 @@
|
|||||||
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||||
if(..())
|
if(..())
|
||||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||||
|
if(istype(tool,/obj/item/weapon/weldingtool))
|
||||||
|
var/obj/item/weapon/weldingtool/welder = tool
|
||||||
|
if(!welder.isOn() || !welder.remove_fuel(1,user))
|
||||||
|
return 0
|
||||||
return affected && affected.open && affected.brute_dam > 0 && target_zone != "mouth"
|
return affected && affected.open && affected.brute_dam > 0 && target_zone != "mouth"
|
||||||
|
|
||||||
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||||
|
|||||||
BIN
icons/mob/human_races/r_machine.dmi
Normal file
BIN
icons/mob/human_races/r_machine.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Reference in New Issue
Block a user