cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-26 22:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into fairylights"

Browse Source 
This reverts commit 2947727659, reversing
changes made to 91063fe882.
This commit is contained in:
Dahlular
2022-07-09 04:55:33 -06:00
parent eb22b66720
commit e51460cb5d
123 changed files with 2065 additions and 3633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+1 -1
View File
@@ -2121,7 +2121,7 @@ datum/sprite_accessory/ears/human/gret
/datum/sprite_accessory/antenna
icon = 'modular_citadel/icons/mob/ipc_antennas.dmi'
color_src = MUTCOLORS3
color_src = MUTCOLORS2
recommended_species = list("ipc")
/datum/sprite_accessory/antenna/none
modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+1 -1
View File
@@ -261,7 +261,7 @@
mutant_heart = /obj/item/organ/heart/ipc
mutantlungs = /obj/item/organ/lungs/ipc
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/synthliz
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
exotic_bloodtype = "SY"
modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
+2 -4
View File
@@ -6,8 +6,7 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
blacklisted = 0
sexes = 0
species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,NOMOUTH)
inherent_traits = list(TRAIT_NOTHIRST)
species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
mutant_bodyparts = list("ipc_screen", "ipc_antenna")
default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
@@ -17,9 +16,8 @@
mutant_heart = /obj/item/organ/heart/ipc
mutantlungs = /obj/item/organ/lungs/ipc
mutantliver = /obj/item/organ/liver/ipc
mutantstomach = /obj/item/organ/stomach/cell
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord) // oracle port
exotic_bloodtype = "HF"
modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+13 -29
View File
@@ -10,9 +10,6 @@
/mob/living/silicon/robot/modules/borgi
set_module = /obj/item/robot_module/borgi
/mob/living/silicon/robot/modules/orepup
set_module = /obj/item/robot_module/orepup
/mob/living/silicon/robot/proc/get_cit_modules()
var/list/modulelist = list()
modulelist["MediHound"] = /obj/item/robot_module/medihound
@@ -20,7 +17,6 @@
modulelist["Security K-9"] = /obj/item/robot_module/k9
modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
modulelist["Borgi"] = /obj/item/robot_module/borgi
modulelist["Orepup"] = /obj/item/robot_module/orepup
return modulelist
/obj/item/robot_module
@@ -265,13 +261,14 @@
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
has_snowflake_deadsprite = TRUE
/*
/obj/item/robot_module/orepup
name = "Ore Pup"
basic_modules = list(
/obj/item/storage/bag/ore/cyborg,
/obj/item/analyzer/nose,
/obj/item/storage/bag/borgdelivery,
/obj/item/dogborg/sleeper/compactor/ore,
/obj/item/dogborg/sleeper/ore,
/obj/item/pickaxe/drill/cyborg,
/obj/item/shovel,
/obj/item/crowbar/cyborg,
@@ -285,33 +282,20 @@
/obj/item/clockwork/slab/cyborg/miner,
/obj/item/clockwork/weapon/ratvarian_spear,
/obj/item/borg/sight/xray/truesight_lens)
cyborg_base_icon = "blade"
moduleselect_icon = "miner"
sleeper_overlay = "bladesleeper"
cyborg_base_icon = "orepup"
moduleselect_icon = "orepup"
sleeper_overlay = "osleeper"
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
cyborg_pixel_offset = -16
/obj/item/robot_module/orepup/be_transformed_to(obj/item/robot_module/old_module)
/obj/item/robot_module/miner/do_transform_animation()
var/mob/living/silicon/robot/R = loc
var/static/list/orepup_models
if(!orepup_models)
orepup_models = list(
"blade" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "blade"),
"vale" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "valemine")
)
orepup_models = sortList(orepup_models)
var/orepup_borg_icon = show_radial_menu(R, R , orepup_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!orepup_borg_icon)
return
switch(orepup_borg_icon)
if("blade")
cyborg_base_icon = "blade"
if("vale")
cyborg_base_icon = "valemine"
sleeper_overlay = "valeminesleeper"
has_snowflake_deadsprite = TRUE
return ..()
R.cut_overlays()
R.setDir(SOUTH)
flick("orepup_transform", R)
do_transform_delay()
R.update_headlamp()
*/
/obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
@@ -369,7 +353,7 @@
cyborg_base_icon = "haydeemedical"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
hat_offset = 3
if("qualified_doctor")
cyborg_base_icon = "qualified_doctor"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'