Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Sprites overhaul (penlight, igniter, handtele, geiger) #262

Merged
merged 2 commits into from
Sep 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modular_ss220/aesthetics/_aesthetics.dme
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "extinguisher\code\extinguisher.dm"
#include "firealarm\code\firealarm.dm"
#include "floors\code\floors.dm"
#include "goonstation\code\items.dm"
#include "hydroponics\code\hydroponics.dm"
#include "keycard\code\keycard.dm"
#include "labeler\code\labeler.dm"
Expand Down
2 changes: 2 additions & 0 deletions modular_ss220/aesthetics/goonstation/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
All files located in this directory and any subdirectories are licensed under the
Creative Commons 3.0 BY-NC-SA license (https://creativecommons.org/licenses/by-nc-sa/3.0)
66 changes: 66 additions & 0 deletions modular_ss220/aesthetics/goonstation/code/items.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/* Geiger */
#define RAD_LEVEL_NORMAL 9
#define RAD_LEVEL_MODERATE 100
#define RAD_LEVEL_HIGH 400
#define RAD_LEVEL_VERY_HIGH 800
#define RAD_LEVEL_CRITICAL 1500

/obj/item/geiger_counter
icon = 'modular_ss220/aesthetics/goonstation/icons/geiger.dmi'
item_state = "geiger"
lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi'
righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi'

/obj/item/geiger_counter/update_icon_state()
if(!scanning)
icon_state = "geiger_off"
else if(emagged)
icon_state = "geiger_on_emag"
else
switch(radiation_count)
if(-INFINITY to RAD_LEVEL_NORMAL)
icon_state = "geiger_on_0"
if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
icon_state = "geiger_on_1"
if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
icon_state = "geiger_on_2"
if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
icon_state = "geiger_on_3"
if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
icon_state = "geiger_on_4"
if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
icon_state = "geiger_on_5"

#undef RAD_LEVEL_NORMAL
#undef RAD_LEVEL_MODERATE
#undef RAD_LEVEL_HIGH
#undef RAD_LEVEL_VERY_HIGH
#undef RAD_LEVEL_CRITICAL

/* Igniter */
/obj/item/assembly/igniter
icon = 'modular_ss220/aesthetics/goonstation/icons/igniter.dmi'
item_state = "igniter"
lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi'
righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi'

/* Penlight */
/obj/item/flashlight/pen
icon = 'modular_ss220/aesthetics/goonstation/icons/penlight.dmi'
item_state = "pen"
lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi'
righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi'

/obj/item/flashlight/pen/update_icon_state()
. = ..()
if(on)
item_state = "[initial(item_state)]-on"
else
item_state = "[initial(item_state)]"

/* Hand teleporter */
/obj/item/hand_tele
icon = 'modular_ss220/aesthetics/goonstation/icons/hand_tele.dmi'
item_state = "hand_tele"
lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi'
righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.