cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
shitcode - b - gone
This commit is contained in:
Letter N
2021-01-20 11:08:21 +08:00
parent 2e2a609d4b
commit 021b28a2b7
44 changed files with 180 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
modular_citadel/code/modules/clothing/trek.dm
View File

@@ -51,58 +51,58 @@
blood_overlay_type = "coat"
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/flashlight,
/obj/item/analyzer,
/obj/item/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle,
/obj/item/taperecorder)
/obj/item/tank/internals/emergency_oxygen,
/obj/item/flashlight,
/obj/item/analyzer,
/obj/item/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle,
/obj/item/taperecorder)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
var/unbuttoned = 0
var/unbuttoned = FALSE
verb/toggle()
set name = "Toggle coat buttons"
set category = "Object"
set src in usr
/obj/item/clothing/suit/storage/fluff/fedcoat/verb/toggle()
set name = "Toggle coat buttons"
set category = "Object"
set src in usr
var/mob/living/L = usr
if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
return FALSE
var/mob/living/L = usr
if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
return FALSE
switch(unbuttoned)
if(0)
icon_state = "[initial(icon_state)]_open"
item_state = "[initial(item_state)]_open"
unbuttoned = 1
to_chat(usr,"You unbutton the coat.")
if(1)
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
unbuttoned = 0
to_chat(usr,"You button up the coat.")
usr.update_inv_wear_suit()
switch(unbuttoned)
if(FALSE)
icon_state = "[initial(icon_state)]_open"
item_state = "[initial(item_state)]_open"
unbuttoned = TRUE
to_chat(usr,"You unbutton the coat.")
if(TRUE)
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
unbuttoned = FALSE
to_chat(usr,"You button up the coat.")
usr.update_inv_wear_suit()
//Variants
//Variants
/obj/item/clothing/suit/storage/fluff/fedcoat/medsci
icon_state = "fedblue"
item_state = "fedblue"
icon_state = "fedblue"
item_state = "fedblue"
/obj/item/clothing/suit/storage/fluff/fedcoat/eng
icon_state = "fedeng"
item_state = "fedeng"
icon_state = "fedeng"
item_state = "fedeng"
/obj/item/clothing/suit/storage/fluff/fedcoat/capt
icon_state = "fedcapt"
item_state = "fedcapt"
icon_state = "fedcapt"
item_state = "fedcapt"
//"modern" ones for fancy
@@ -124,18 +124,18 @@
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
//Variants
//Variants
/obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
icon_state = "fedmodernblue"
item_state = "fedmodernblue"
icon_state = "fedmodernblue"
item_state = "fedmodernblue"
/obj/item/clothing/suit/storage/fluff/modernfedcoat/eng
icon_state = "fedmoderneng"
item_state = "fedmoderneng"
icon_state = "fedmoderneng"
item_state = "fedmoderneng"
/obj/item/clothing/suit/storage/fluff/modernfedcoat/sec
icon_state = "fedmodernsec"
item_state = "fedmodernsec"
icon_state = "fedmodernsec"
item_state = "fedmodernsec"
/obj/item/clothing/head/caphat/formal/fedcover
name = "Federation Officer's Cap"
@@ -146,22 +146,22 @@
mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "fedcapofficer"
//Variants
//Variants
/obj/item/clothing/head/caphat/formal/fedcover/medsci
icon_state = "fedcapsci"
item_state = "fedcapsci"
icon_state = "fedcapsci"
item_state = "fedcapsci"
/obj/item/clothing/head/caphat/formal/fedcover/eng
icon_state = "fedcapeng"
item_state = "fedcapeng"
icon_state = "fedcapeng"
item_state = "fedcapeng"
/obj/item/clothing/head/caphat/formal/fedcover/sec
icon_state = "fedcapsec"
item_state = "fedcapsec"
icon_state = "fedcapsec"
item_state = "fedcapsec"
/obj/item/clothing/head/caphat/formal/fedcover/black
icon_state = "fedcapblack"
item_state = "fedcapblack"
icon_state = "fedcapblack"
item_state = "fedcapblack"
//orvilike caps
/obj/item/clothing/head/kepi/orvi

10
modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
View File

@@ -2,7 +2,7 @@
The Recolourable Energy Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
obj/item/gun/energy/e_gun/cx
/obj/item/gun/energy/e_gun/cx
name = "\improper CX Model D Energy Gun"
desc = "An overpriced hybrid energy gun with two settings: disable, and kill. Manufactured by CX Armories. Has a polychromic coating."
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
@@ -14,18 +14,18 @@ obj/item/gun/energy/e_gun/cx
flight_y_offset = 10
var/body_color = "#252528"
obj/item/gun/energy/e_gun/cx/ComponentInitialize()
/obj/item/gun/energy/e_gun/cx/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
obj/item/gun/energy/e_gun/cx/update_overlays()
/obj/item/gun/energy/e_gun/cx/update_overlays()
. = ..()
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
if(body_color)
body_overlay.color = body_color
. += body_overlay
obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
/obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
. = ..()
if(!in_range(src, user)) //Basic checks to prevent abuse
return
@@ -39,7 +39,7 @@ obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
/obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = ..()
if(isinhands)
var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")

3
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
View File

@@ -216,7 +216,6 @@
..()
/datum/reagent/fermi/nanite_b_gone/overdose_process(mob/living/carbon/C)
//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites)
if(prob(5))
to_chat(C, "<span class='warning'>The residual voltage from the nanites causes you to seize up!</b></span>")
@@ -230,7 +229,7 @@
N.adjust_nanites(-10*cached_purity)
..()
datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
/datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
for(var/active_obj in react_objs)
if(O == active_obj)
return