shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9421 from Ghommie/Ghommie-cit218

Browse Source 
Porting some spraycan fixes and tweaks.
This commit is contained in:
kevinz000
2019-10-08 00:34:58 -07:00
committed by GitHub
parent 0a29acb9ef f01f00710f
commit fe1a78f413
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/research/xenobiology/xenobiology.dm
View File

@@ -523,7 +523,8 @@
/obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
var/chosen = pick(difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan)))
var/blacklisted_cans = list(/obj/item/toy/crayon/spraycan/borg, /obj/item/toy/crayon/spraycan/infinite)
var/chosen = pick(subtypesof(/obj/item/toy/crayon/spraycan) - blacklisted_cans)
var/obj/item/O = new chosen(null)
if(!user.put_in_active_hand(O))
O.forceMove(user.drop_location())