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

Fixed issue 281. Rockdtben is working on a more comprehensive fix, but this will do for now.

Browse Source 
Fixed issue 396. (delicious low hanging fruit)
Fixed issue 165. "Fixed". I removed the effects of the welding fuel reagent, seeing as a proper fix doesn't seem to be forthcoming.
Fixed being able to create thousands of stools in a single turf.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3267 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-03-10 16:14:03 +00:00
parent 2eb4e334de
commit eb3b9b70aa
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/disease.dm
View File

@@ -112,7 +112,7 @@ to null does not delete the object itself. Thank you.
if(spread_type != AIRBORNE && spread_type != SPECIAL) if(spread_type != AIRBORNE && spread_type != SPECIAL)
check_range = 0 // everything else, like infect-on-contact things, only infect things on top of it check_range = 0 // everything else, like infect-on-contact things, only infect things on top of it
for(var/mob/living/carbon/M in oviewers(check_range, source)) for(var/mob/living/carbon/M in oview(check_range, source)) //I have no idea why oview works when oviewers doesn't. -Pete
M.contract_disease(src) M.contract_disease(src)
return return

1
code/game/machinery/newscaster.dm
View File

@@ -667,6 +667,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
name = "Newspaper" name = "Newspaper"
desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations."
icon_state = "newspaper" icon_state = "newspaper"
w_class = 2 //Let's make it fit in trashbags!
var/screen = 0 var/screen = 0
var/pages = 0 var/pages = 0
var/curr_page = 0 var/curr_page = 0

2
code/game/objects/stacks/metal.dm
View File

@@ -65,7 +65,7 @@ FLOOR TILES
// /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0) // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0)
var/global/list/datum/stack_recipe/metal_recipes = list ( \ var/global/list/datum/stack_recipe/metal_recipes = list ( \
new/datum/stack_recipe("stool", /obj/structure/stool, on_floor = 1), \ new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \

3
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -940,6 +940,8 @@ datum
reagent_state = LIQUID reagent_state = LIQUID
color = "#660000" // rgb: 102, 0, 0 color = "#660000" // rgb: 102, 0, 0
//Commenting this out as it's horribly broken. It's a neat effect though, so it might be worth making a new reagent (that is less common) with similar effects. -Pete
/*
reaction_obj(var/obj/O, var/volume) reaction_obj(var/obj/O, var/volume)
src = null src = null
var/turf/the_turf = get_turf(O) var/turf/the_turf = get_turf(O)
@@ -963,6 +965,7 @@ datum
M:adjustToxLoss(1) M:adjustToxLoss(1)
..() ..()
return return
*/
space_cleaner space_cleaner
name = "Space cleaner" name = "Space cleaner"