cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-24 21:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Examine Code Refactor

Browse Source
This commit is contained in:
Dip
2020-10-06 23:36:21 -03:00
parent c433514622
commit aa7d47a23b
334 changed files with 1337 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/gamemodes/gangs/dominator.dm
+5 -5
View File
@@ -67,18 +67,18 @@
icon_state = "dominator-broken"
/obj/machinery/dominator/examine(mob/user)
..()
. = ..()
if(stat & BROKEN)
return
if(gang && gang.domination_time != NOT_DOMINATING)
if(gang.domination_time > world.time)
to_chat(user, "<span class='notice'>Hostile Takeover in progress. Estimated [gang.domination_time_remaining()] seconds remain.</span>")
. += "<span class='notice'>Hostile Takeover in progress. Estimated [gang.domination_time_remaining()] seconds remain.</span>"
else
to_chat(user, "<span class='notice'>Hostile Takeover of [station_name()] successful. Have a great day.</span>")
. += "<span class='notice'>Hostile Takeover of [station_name()] successful. Have a great day.</span>"
else
to_chat(user, "<span class='notice'>System on standby.</span>")
to_chat(user, "<span class='danger'>System Integrity: [round((obj_integrity/max_integrity)*100,1)]%</span>")
. += "<span class='notice'>System on standby.</span>"
. += "<span class='danger'>System Integrity: [round((obj_integrity/max_integrity)*100,1)]%</span>"
/obj/machinery/dominator/process()
..()
modular_citadel/code/game/objects/ids.dm
+2 -2
View File
@@ -42,8 +42,8 @@
update_icon()
/obj/item/card/id/knight/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. = ..()
. += "<span class='notice'>Alt-click to recolor it.</span>"
//=================================================
modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+7 -7
View File
@@ -101,8 +101,8 @@
update_light()
/obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. = ..()
. += "<span class='notice'>Alt-click to recolor it.</span>"
/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
. = ..()
@@ -231,8 +231,8 @@
return ..()
/obj/item/toy/sword/cx/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. = ..()
. += "<span class='notice'>Alt-click to recolor it.</span>"
/////////////////////////////////////////////////////
// HYPEREUTACTIC Blades /////////////////////////
@@ -335,9 +335,9 @@
. += blade_inhand
/obj/item/twohanded/dualsaber/hypereutactic/examine(mob/user)
..()
. = ..()
if(!hacked)
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. += "<span class='notice'>Alt-click to recolor it.</span>"
/obj/item/twohanded/dualsaber/hypereutactic/rainbow_process()
. = ..()
@@ -389,4 +389,4 @@
/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
desc = "A custom-built toy with fancy rainbow lights built-in."
hacked = TRUE
hacked = TRUE
modular_citadel/code/modules/arousal/toys/dildos.dm
+2 -2
View File
@@ -93,9 +93,9 @@
pixel_x = rand(-7,7)
/obj/item/dildo/examine(mob/user)
..()
. = ..()
if(can_customize)
user << "<span class='notice'>Alt-Click \the [src.name] to customize it.</span>"
. += "<span class='notice'>Alt-Click \the [src.name] to customize it.</span>"
/obj/item/dildo/random//totally random
name = "random dildo"//this name will show up in vendors and shit so you know what you're vending(or don't, i guess :^))
modular_citadel/code/modules/clothing/clothing.dm
+2 -2
View File
@@ -80,9 +80,9 @@
user.regenerate_icons()
/obj/item/clothing/examine(mob/user)
..()
. = ..()
if(hasprimary | hassecondary | hastertiary)
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>") // so people don't "OOC how do you use polychromic clothes????"
. += "<span class='notice'>Alt-click to recolor it.</span>"
/obj/item/clothing/Initialize()
..()
modular_citadel/code/modules/clothing/glasses/phantomthief.dm
+2 -2
View File
@@ -20,9 +20,9 @@
. = ..()
if(combattoggle_redir)
if(world.time >= nextadrenalinepop)
to_chat(user, "<span class='notice'>The built-in adrenaline injector is ready for use.</span>")
. += "<span class='notice'>The built-in adrenaline injector is ready for use.</span>"
else
to_chat(user, "<span class='notice'>[DisplayTimeText(nextadrenalinepop - world.time)] left before the adrenaline injector can be used again.")
. += "<span class='notice'>[DisplayTimeText(nextadrenalinepop - world.time)] left before the adrenaline injector can be used again."
/obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/user, combatmodestate)
if(istype(user))
modular_citadel/code/modules/clothing/spacesuits/cydonian_armor.dm
+2 -2
View File
@@ -172,5 +172,5 @@
update_light()
/obj/item/clothing/suit/space/hardsuit/lavaknight/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. = ..()
. += "<span class='notice'>Alt-click to recolor it.</span>"
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
+4 -4
View File
@@ -176,9 +176,9 @@
/obj/item/gun/ballistic/automatic/magrifle_e/examine(mob/user)
. = ..()
if(cell)
to_chat(user, "<span class='notice'>[src]'s cell is [round(cell.charge / cell.maxcharge, 0.1) * 100]% full.</span>")
. += "<span class='notice'>[src]'s cell is [round(cell.charge / cell.maxcharge, 0.1) * 100]% full.</span>"
else
to_chat(user, "<span class='notice'>[src] doesn't seem to have a cell!</span>")
. += "<span class='notice'>[src] doesn't seem to have a cell!</span>"
/obj/item/gun/ballistic/automatic/magrifle_e/can_shoot()
if(QDELETED(cell))
@@ -239,9 +239,9 @@
/obj/item/gun/ballistic/automatic/pistol/mag_e/examine(mob/user)
. = ..()
if(cell)
to_chat(user, "<span class='notice'>[src]'s cell is [round(cell.charge / cell.maxcharge, 0.1) * 100]% full.</span>")
. += "<span class='notice'>[src]'s cell is [round(cell.charge / cell.maxcharge, 0.1) * 100]% full.</span>"
else
to_chat(user, "<span class='notice'>[src] doesn't seem to have a cell!</span>")
. += "<span class='notice'>[src] doesn't seem to have a cell!</span>"
/obj/item/gun/ballistic/automatic/pistol/mag_e/can_shoot()
if(QDELETED(cell))
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+2 -2
View File
@@ -218,8 +218,8 @@
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
/obj/item/gun/ballistic/automatic/AM4B/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
. = ..()
. += "<span class='notice'>Alt-click to recolor it.</span>"
/obj/item/ammo_box/magazine/toy/AM4C
name = "foam force AM4-C magazine"
modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+2 -2
View File
@@ -94,8 +94,8 @@
update_icon()
/obj/item/gun/energy/pumpaction/examine(mob/user) //so people don't ask HOW TO CHANGE FIRING MODE
..()
to_chat(user, "<span class='notice'>Alt-click to change firing modes.</span>")
. = ..()
. += "<span class='notice'>Alt-click to change firing modes.</span>"
/obj/item/gun/energy/pumpaction/worn_overlays(isinhands, icon_file) //ammo counter for inhands
. = ..()
modular_citadel/code/modules/vore/resizing/holder_micro_vr.dm
+2 -1
View File
@@ -10,8 +10,9 @@
pixel_y = 0 // Override value from parent.
/obj/item/holder/micro/examine(var/mob/user)
. = list()
for(var/mob/living/M in contents)
M.examine(user)
. += M.examine(user)
/obj/item/holder/MouseDrop(mob/M as mob)
..()