Skip to content

Commit

Permalink
Fixes three problems of my own identification/invention (tgstation#18824
Browse files Browse the repository at this point in the history
)

* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.

* I failed a spot check
  • Loading branch information
Incoming5643 authored and KorPhaeron committed Jun 22, 2016
1 parent f04cf85 commit b622d10
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion code/game/gamemodes/meteor/meteors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,14 @@
hits = 2
heavy = 1
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
meteordrop = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human, /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
var/meteorgibs = /obj/effect/gibspawner/generic

/obj/effect/meteor/meaty/New()
for(var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/M in meteordrop)
meteordrop -= M
meteordrop += pick(subtypesof(M))

for(var/obj/item/organ/tongue/T in meteordrop)
meteordrop -= T
meteordrop += pick(typesof(T))
Expand Down
4 changes: 3 additions & 1 deletion code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name = "Unknown"
var/mob_type = null
var/mob_name = ""
var/mob_gender = MALE
var/mob_gender = null
var/death = TRUE //Kill the mob
var/roundstart = TRUE //fires on initialize
var/instant = FALSE //fires on New
Expand Down Expand Up @@ -66,6 +66,8 @@
var/mob/living/M = new mob_type(get_turf(src)) //living mobs only
if(!random)
M.real_name = mob_name ? mob_name : M.name
if(!mob_gender)
mob_gender = pick(MALE, FEMALE)
M.gender = mob_gender
if(faction)
M.faction = list(faction)
Expand Down
1 change: 1 addition & 0 deletions code/modules/surgery/bodyparts/bodyparts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
else
H.visible_message("<span class='warning'>[user] jams [src] into [H]'s empty socket!</span>",\
"<span class='notice'>[user] forces [src] into your empty socket, and it locks into place!</span>")
user.unEquip(src,1)
attach_limb(C)
return
..()
Expand Down

0 comments on commit b622d10

Please sign in to comment.