and finally, the modules folder. Now I can publish and take a break

This commit is contained in:
deathride58
2018-07-02 01:19:37 -04:00
parent 91805b8789
commit b1688405d9
380 changed files with 2204 additions and 1588 deletions
@@ -39,7 +39,7 @@ To add a crossbreed:
/obj/item/slimecross/Initialize()
..()
name = colour + " " + name
name = effect + " " + colour + " extract"
var/itemcolor = "#FFFFFF"
switch(colour)
if("orange")
@@ -564,6 +564,7 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/cerulean/on_remove()
if(clone)
clone.visible_message("<span class='warning'>[clone] dissolves into a puddle of goo!</span>")
clone.unequip_everything()
qdel(clone)
/datum/status_effect/stabilized/pyrite
@@ -386,6 +386,9 @@ Charged extracts:
if(user == M)
to_chat(user, "<span class='warning'>You can't drink the love potion. What are you, a narcissist?</span>")
return ..()
if(M.has_status_effect(STATUS_EFFECT_INLOVE))
to_chat(user, "<span class='warning'>[M] is already lovestruck!</span>")
return ..()
M.visible_message("<span class='danger'>[user] starts to feed [M] a love potion!</span>",
"<span class='userdanger'>[user] starts to feed you a love potion!</span>")
@@ -393,10 +396,11 @@ Charged extracts:
if(!do_after(user, 50, target = M))
return
to_chat(user, "<span class='notice'>You feed [M] the love potion!</span>")
to_chat(M, "<span class='notice'>You develop feelings for [user], and anyone [p_they(user)] like.</span>")
if(!("[REF(user)]" in M.faction) && M.mind)
M.mind.store_memory("You have strong feelings for [user].")
to_chat(M, "<span class='notice'>You develop feelings for [user], and anyone [user.p_they()] like.</span>")
if(M.mind)
M.mind.store_memory("You are in love with [user].")
M.faction |= "[REF(user)]"
M.apply_status_effect(STATUS_EFFECT_INLOVE, user)
qdel(src)
/obj/item/slimepotion/peacepotion
@@ -21,6 +21,7 @@ Recurring extracts:
extract.desc = desc
extract.icon = icon
extract.icon_state = icon_state
extract.color = color
extract.recurring = TRUE
src.forceMove(extract)
START_PROCESSING(SSobj,src)
@@ -19,7 +19,7 @@ Reproductive extracts:
return
if(istype(O, /obj/item/storage/bag/bio))
var/list/inserted = list()
O.SendSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
if(inserted.len)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = inserted[1]
if(istype(M))
@@ -4,7 +4,7 @@ Self-sustaining extracts:
*/
/obj/item/slimecross/selfsustaining
name = "self-sustaining extract"
effect = "selfsustaining"
effect = "self-sustaining"
icon_state = "selfsustaining"
var/extract_type = /obj/item/slime_extract
@@ -23,6 +23,7 @@ Self-sustaining extracts:
A.extract = X
A.icon = icon
A.icon_state = icon_state
A.color = color
qdel(src)
/obj/item/autoslime/Initialize()
@@ -163,4 +163,4 @@ Stabilized extracts:
regencore = regen
regen.forceMove(src)
return
return ..()
return ..()
@@ -702,7 +702,7 @@
imp.implant(SM, user)
SM.access_card = new /obj/item/card/id/syndicate(SM)
SM.access_card.flags_1 |= NODROP_1
SM.access_card.item_flags |= NODROP
/obj/item/slimepotion/transference
name = "consciousness transference potion"
@@ -725,7 +725,11 @@
if(SM.sentience_type != animal_type)
to_chat(user, "<span class='warning'>You cannot transfer your consciousness to [SM].</span>" )
return ..()
if(jobban_isbanned(user, ROLE_ALIEN)) //ideally sentience and trasnference potions should be their own unique role.
var/jb = jobban_isbanned(user, ROLE_ALIEN)
if(QDELETED(src) || QDELETED(M) || QDELETED(user))
return
if(jb) //ideally sentience and trasnference potions should be their own unique role.
to_chat(user, "<span class='warning'>Your mind goes blank as you attempt to use the potion.</span>")
return
@@ -909,7 +913,7 @@
/obj/item/slimepotion/slime/slimeradio
name = "bluespace radio potion"
desc = "A strange chemical that grants those who ingest it the ability to broadcast and recieve subscape radio waves."
desc = "A strange chemical that grants those who ingest it the ability to broadcast and receive subscape radio waves."
icon = 'icons/obj/chemical.dmi'
icon_state = "potgrey"