cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames a few variables. Also reorders icon fallback order again. (#51060)

Browse Source 
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
This commit is contained in:
nemvar
2020-05-25 06:47:19 +02:00
committed by GitHub
parent d0d430e964
commit 6ef421be42
356 changed files with 1938 additions and 1938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/spaceruin_code/forgottenship.dm
+3 -3
View File
@@ -58,7 +58,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
. = ..()
info = "Welcome to most advanced cruiser owned by Cyber Sun Industries!<br>You might notice, that this cruiser is equipped with 12 prototype laser turrets making any hostile boarding attempts futile.<br>Other facilities built on the ship are: Simple atmospheric system, Camera system with built-in X-ray visors and Safety module, enabling emergency engines in case of... you know, emergency.<br>Emergency system will bring you to nearest syndicate pod containing everything needed for human life.<br><br><b>In case of emergency, you must remember the pod-door activation code - [GLOB.fscpassword]</b><br><br>Cyber Sun Industries (C) 2484."
icon_state = "paper_words"
item_state = "paper"
inhand_icon_state = "paper"
/obj/item/paper/fluff/ruins/forgottenship/powerissues
name = "Power issues"
@@ -131,7 +131,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
name = "Cybersun hardsuit helmet"
desc = "Prototype hardsuit helmet with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else."
icon_state = "cybersun"
item_state = "cybersun"
inhand_icon_state = "cybersun"
hardsuit_type = "cybersun"
armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
strip_delay = 600
@@ -140,7 +140,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
/obj/item/clothing/suit/space/hardsuit/cybersun
icon_state = "cybersun"
item_state = "cybersun"
inhand_icon_state = "cybersun"
hardsuit_type = "cybersun"
name = "Cybersun hardsuit"
desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else."