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 #375 from caelaislinn/master

Browse Source 
bug / map fixes
This commit is contained in:
Tastyfish
2012-02-06 19:30:51 -08:00
parent 26bc74b7fd 1366bf7e34
commit b0113eaac9
6 changed files with 79 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/WorkInProgress/Cael_Aislinn/MultiZ.dm
View File

@@ -174,9 +174,36 @@
H.apply_damage(0.5*damage, BRUTE, "l_arm")
H.apply_damage(0.5*damage, BRUTE, "r_arm")
//var/obj/effect/decal/cleanable/blood/B = new(src.loc)
//B.blood_DNA = H.dna.unique_enzymes
//B.blood_type = H.b_type
/*
/obj/effect/decal/cleanable/blood
name = "Blood"
desc = "It's red and disgusting."
density = 0
anchored = 1
layer = 2
icon = 'blood.dmi'
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
var/list/viruses = list()
blood_DNA = list()
var/datum/disease2/disease/virus2 = null
var/OriginalMob = null
Del()
for(var/datum/disease/D in viruses)
D.cure(0)
..()
*/
var/obj/effect/decal/cleanable/blood/B = new(src.loc)
var/list/blood_DNA_temp[1]
blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
B.blood_DNA = blood_DNA_temp
B.virus2 = H.virus2
for(var/datum/disease/D in H.viruses)
var/datum/disease/newDisease = new D.type
B.viruses += newDisease
newDisease.holder = B
H:weakened = max(H:weakened,2)
H:updatehealth()

77
code/game/machinery/autolathe.dm
View File

@@ -185,45 +185,48 @@
usr << "\red The autolathe is busy. Please wait for completion of previous operation."
if (!busy)
if(href_list["make"])
makeNew:
var/turf/T = src.loc
var/obj/template = locate(href_list["make"])
var/multiplier = text2num(href_list["multiplier"])
if (!multiplier) multiplier = 1
var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5)
if(src.m_amount >= template.m_amt*multiplier && src.g_amount >= template.g_amt*multiplier)
busy = 1
use_power(power)
icon_state = "autolathe"
flick("autolathe_n",src)
spawn(16)
while(outputAmount > 0)
var/turf/T = src.loc
var/obj/template = locate(href_list["make"])
var/multiplier = text2num(href_list["multiplier"])
if (!multiplier) multiplier = 1
var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5)
if( (src.m_amount >= template.m_amt*multiplier) && (src.g_amount >= template.g_amt*multiplier) )
use_power(power)
icon_state = "autolathe"
flick("autolathe_n",src)
spawn(16)
use_power(power)
spawn(16)
src.m_amount -= template.m_amt*multiplier
src.g_amount -= template.g_amt*multiplier
if(src.m_amount < 0)
src.m_amount = 0
if(src.g_amount < 0)
src.g_amount = 0
var/obj/new_item = new template.type(src)
for(var/obj/item/weapon/storage/container in src.contents)
container.attackby(new_item)
if(new_item.loc == container)
break
if (multiplier>1)
var/obj/item/stack/S = new_item
S.amount = multiplier
if(new_item in src)
new_item.loc = T
src.updateUsrDialog()
outputAmount -= 1
if(outputAmount > 0)
goto makeNew
busy = 0
else
outputAmount = 1
if(!busy)
busy = 1
use_power(power)
flick("autolathe_n",src)
spawn(16)
use_power(power)
flick("autolathe_n",src)
spawn(16)
flick("autolathe_n",src)
src.m_amount -= template.m_amt*multiplier
src.g_amount -= template.g_amt*multiplier
if(src.m_amount < 0)
src.m_amount = 0
if(src.g_amount < 0)
src.g_amount = 0
var/obj/new_item = new template.type(src)
for(var/obj/item/weapon/storage/container in src.contents)
container.attackby(new_item)
if(new_item.loc == container)
break
if (multiplier>1)
var/obj/item/stack/S = new_item
S.amount = multiplier
if(new_item in src)
new_item.loc = T
src.updateUsrDialog()
outputAmount -= 1
busy = 0
else
outputAmount = 1
break
if(href_list["act"])
var/temp_wire = href_list["wire"]
if(href_list["act"] == "pulse")

4
code/game/machinery/computer/camera_monitor.dm
View File

@@ -6,9 +6,9 @@
else
switch(department)
if("Security")
networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo")
networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo","Command","Solars")
if("Engineering")
networks = list("Engineering","Tcomsat","Singularity","Atmospherics")
networks = list("Engineering","Tcomsat","Singularity","Atmospherics","Solars")
if("Research")
networks = list("Research","Bomb Testing")
if("Medbay")

2
code/game/mecha/mech_bay.dm
View File

@@ -31,7 +31,7 @@
proc/init_devices()
recharge_console = locate() in range(1,src)
recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir)) //gets the recharge poyrt from the facing dir
recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir)) //gets the recharge port from the facing dir
if(recharge_console)
recharge_console.recharge_floor = src
if(recharge_port)