[MIRROR] Moves base_icon_state to the base of atom (#464)

* to the base (#52917)

* Moves base_icon_state to the base of atom

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
SkyratBot
2020-08-21 22:36:33 +01:00
committed by GitHub
co-authored by Rohesie
parent 4a62fb4557
commit ac8bf51024
8 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -77,7 +77,7 @@
myseed.genes += G
set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color)
setDir(CalcDir())
var/base_icon_state = initial(icon_state)
base_icon_state = initial(icon_state)
if(!floor)
switch(dir) //offset to make it be on the wall rather than on the floor
if(NORTH)
+1 -1
View File
@@ -297,6 +297,7 @@
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
resistance_flags = INDESTRUCTIBLE
base_icon_state = "defibpaddles"
var/revivecost = 1000
var/cooldown = FALSE
@@ -304,7 +305,6 @@
var/obj/item/defibrillator/defib
var/req_defib = TRUE
var/combat = FALSE //If it penetrates armor and gives additional functionality
var/base_icon_state = "defibpaddles"
var/wielded = FALSE // track wielded status on item
/obj/item/shockpaddles/ComponentInitialize()
+1 -1
View File
@@ -199,7 +199,7 @@
force = 3
throwforce = 3
throw_speed = 3
var/base_icon_state = "eshield" // [base_icon_state]1 for expanded, [base_icon_state]0 for contracted
base_icon_state = "eshield" // [base_icon_state]1 for expanded, [base_icon_state]0 for contracted
var/on_force = 10
var/on_throwforce = 8
var/on_throw_speed = 2