cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5858 from Zuhayr/master

Browse Source 
Fixes
This commit is contained in:
Mloc
2014-08-01 15:02:23 +01:00
parent a6e483d48d afc40e7f44
commit 6133083ca6
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/jobs/job_controller.dm
View File

@@ -355,7 +355,7 @@ var/global/datum/controller/occupations/job_master
if(job) if(job)
//Equip custom gear loadout. //Equip custom gear loadout.
if(H.client.prefs.gear && H.client.prefs.gear.len) if(H.client.prefs.gear && H.client.prefs.gear.len && job.title != "Cyborg" && job.title != "AI")
for(var/thing in H.client.prefs.gear) for(var/thing in H.client.prefs.gear)
var/datum/gear/G = gear_datums[thing] var/datum/gear/G = gear_datums[thing]

13
code/game/machinery/cryopod.dm
View File

@@ -152,7 +152,8 @@ var/global/list/frozen_items = list()
/obj/item/clothing/suit, /obj/item/clothing/suit,
/obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots,
/obj/item/blueprints, /obj/item/blueprints,
/obj/item/clothing/head/helmet/space/ /obj/item/clothing/head/helmet/space,
/obj/item/weapon/storage/internal
) )
/obj/machinery/cryopod/right /obj/machinery/cryopod/right
@@ -186,6 +187,8 @@ var/global/list/frozen_items = list()
if(W.contents.len) //Make sure we catch anything not handled by del() on the items. if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
for(var/obj/item/O in W.contents) for(var/obj/item/O in W.contents)
if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets you fuck!
continue
O.loc = src O.loc = src
//Delete all items not on the preservation list. //Delete all items not on the preservation list.
@@ -194,6 +197,7 @@ var/global/list/frozen_items = list()
items -= announce // or the autosay radio. items -= announce // or the autosay radio.
for(var/obj/item/W in items) for(var/obj/item/W in items)
var/preserve = null var/preserve = null
for(var/T in preserve_items) for(var/T in preserve_items)
if(istype(W,T)) if(istype(W,T))
@@ -204,11 +208,14 @@ var/global/list/frozen_items = list()
del(W) del(W)
else else
frozen_items += W frozen_items += W
W.loc = null
//Update any existing objectives involving this mob. //Update any existing objectives involving this mob.
for(var/datum/objective/O in all_objectives) for(var/datum/objective/O in all_objectives)
if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind) //We don't want revs to get objectives that aren't for heads of staff. Letting them win or lose based on cryo is silly so we remove the objective. // We don't want revs to get objectives that aren't for heads of staff. Letting
del(O) //TODO: Update rev objectives on login by head (may happen already?) ~ Z // them win or lose based on cryo is silly so we remove the objective.
if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind)
del(O)
else if(O.target && istype(O.target,/datum/mind)) else if(O.target && istype(O.target,/datum/mind))
if(O.target == occupant.mind) if(O.target == occupant.mind)
if(O.owner && O.owner.current) if(O.owner && O.owner.current)

3
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -284,10 +284,13 @@
/mob/living/silicon/robot/proc/updatename(var/prefix as text) /mob/living/silicon/robot/proc/updatename(var/prefix as text)
if(prefix) if(prefix)
modtype = prefix modtype = prefix
if(mmi)
if(istype(mmi, /obj/item/device/mmi/posibrain)) if(istype(mmi, /obj/item/device/mmi/posibrain))
braintype = "Android" braintype = "Android"
else else
braintype = "Cyborg" braintype = "Cyborg"
else
braintype = "Robot"
var/changed_name = "" var/changed_name = ""
if(custom_name) if(custom_name)

10
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -398,14 +398,14 @@
/obj/item/weapon/robot_module/drone /obj/item/weapon/robot_module/drone
name = "drone module" name = "drone module"
stacktypes = list( stacktypes = list(
/obj/item/stack/sheet/wood/cyborg = 1, /obj/item/stack/sheet/wood = 1,
/obj/item/stack/sheet/mineral/plastic/cyborg = 1, /obj/item/stack/sheet/mineral/plastic = 1,
/obj/item/stack/sheet/rglass/cyborg = 5, /obj/item/stack/sheet/rglass = 5,
/obj/item/stack/tile/wood = 5, /obj/item/stack/tile/wood = 5,
/obj/item/stack/rods = 15, /obj/item/stack/rods = 15,
/obj/item/stack/tile/plasteel = 15, /obj/item/stack/tile/plasteel = 15,
/obj/item/stack/sheet/metal/cyborg = 20, /obj/item/stack/sheet/metal = 20,
/obj/item/stack/sheet/glass/cyborg = 20, /obj/item/stack/sheet/glass = 20,
/obj/item/weapon/cable_coil = 30 /obj/item/weapon/cable_coil = 30
) )