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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

Browse Source 
# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
zerothebigboy
2021-03-19 14:30:05 -04:00
parent c64e7ee269 5e6122e554
commit 8456b3f709
72 changed files with 1768 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/travelling_trader.dm
+1 -1
View File
@@ -200,7 +200,7 @@
return FALSE
/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/give_reward(mob/giver) //the reward is actually given in a jar, because releasing it onto the station might be a bad idea
var/obj/item/pet_carrier/bluespace/jar = new(get_turf(src))
var/obj/item/pet_carrier/bluespace/single_use/jar = new(get_turf(src))
var/chosen_animal = pickweight(possible_rewards)
var/mob/living/new_animal = new chosen_animal(jar)
if(giver && giver.tag)