cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/prosfab_designs.dm
View File

@@ -16,7 +16,7 @@
if(prosfab.manufacturer)
var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer]
newspecies = manf.suggested_species
O.species = all_species[newspecies]
O.species = GLOB.all_species[newspecies]
if(istype(O,/obj/item/organ/external))
var/obj/item/organ/external/EO = O
if(EO.species.base_color)
@@ -54,7 +54,7 @@
EO.remove_rejuv()
for(var/obj/item/organ/external/O in H.organs)
O.species = all_species[newspecies] //VOREStation Edit with species suggestion above
O.species = GLOB.all_species[newspecies]
O.robotize(prosfab.manufacturer)
O.dna = new/datum/dna()
O.dna.ResetUI()