shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Part 2

Browse Source
This commit is contained in:
Ghommie
2019-11-19 18:00:56 +01:00
parent a52e292cc8
commit dd101ef221
113 changed files with 519 additions and 552 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
@@ -66,18 +66,18 @@
add_overlay("damage")
/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/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()
..()