adds lightbulb removing skillchip (#52603)

* shawty got low low low low low low

* Update code/modules/library/skill_learning/skillchip.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* aaagh

* fuck

* review

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
This commit is contained in:
Fikou
2020-08-06 11:16:02 -03:00
committed by GitHub
co-authored by ATH1909
parent 886ca0f8dd
commit 613cfae75c
4 changed files with 24 additions and 5 deletions
+1
View File
@@ -194,6 +194,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE "underwater_basketweaving"
#define TRAIT_WINE_TASTER "wine_taster"
#define TRAIT_BONSAI "bonsai"
#define TRAIT_LIGHTBULB_REMOVER "lightbulb_remover"
#define TRAIT_KNOW_CYBORG_WIRES "know_cyborg_wires"
#define TRAIT_KNOW_ENGI_WIRES "know_engi_wires"
@@ -393,7 +393,7 @@
skill_description = "Trim hedges and potted plants into marvelous new shapes with any old knife. Not applicable to plastic plants."
skill_icon = "spa"
activate_message = "<span class='notice'>Your mind is filled with plant arrangments.</span>"
deactivate_message = "<span class='notice'>Your can't remember how a hedge looks like anymore.</span>"
deactivate_message = "<span class='notice'>You can't remember what a hedge looks like anymore.</span>"
/obj/item/skillchip/useless_adapter
name = "Skillchip adapter"
@@ -406,3 +406,12 @@
// Literally does nothing.
complexity = 0
slot_use = 0
/obj/item/skillchip/light_remover
name = "N16H7M4R3 skillchip"
auto_trait = TRAIT_LIGHTBULB_REMOVER
skill_name = "Lightbulb Removing"
skill_description = "Stop failing taking out lightbulbs today, no gloves needed!"
skill_icon = "lightbulb"
activate_message = "<span class='notice'>Your feel like your pain receptors are less sensitive to hot objects.</span>"
deactivate_message = "<span class='notice'>You feel like hot objects could stop you again...</span>"
+12 -4
View File
@@ -676,12 +676,20 @@
else if(istype(user) && user.dna.check_mutation(TK))
to_chat(user, "<span class='notice'>You telekinetically remove the light [fitting].</span>")
else
to_chat(user, "<span class='warning'>You try to remove the light [fitting], but you burn your hand on it!</span>")
var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage
if(affecting?.receive_damage( 0, 5 )) // 5 burn damage
H.update_damage_overlays()
return // if burned, don't remove the light
if(HAS_TRAIT(user, TRAIT_LIGHTBULB_REMOVER))
to_chat(user, "<span class='notice'>You feel like you're burning, but you can push through.</span>")
if(!do_after(user, 5 SECONDS, target = src))
return
if(affecting?.receive_damage( 0, 10 )) // 10 more burn damage
H.update_damage_overlays()
to_chat(user, "<span class='notice'>You manage to remove the light [fitting], shattering it in process.</span>")
break_light_tube()
else
to_chat(user, "<span class='warning'>You try to remove the light [fitting], but you burn your hand on it!</span>")
return
else
to_chat(user, "<span class='notice'>You remove the light [fitting].</span>")
// create a light tube/bulb item and put it in the user's hand
+1
View File
@@ -18,6 +18,7 @@
/obj/item/skillchip/basketweaving=2,
/obj/item/skillchip/bonsai=2,
/obj/item/skillchip/wine_taster=2,
/obj/item/skillchip/light_remover=2,
/obj/item/skillchip/useless_adapter=5)
contraband = list(/obj/item/dice/fudge = 9)
premium = list(/obj/item/melee/skateboard/pro = 3,