mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Fixed the changelog.
Buffed the janitor's cleaning grenades. Fixed the void jetpack not having any oxygen, fixed nuke ops starting with empty jetpacks, fixed the spacesuit admin equip. Renamed plasteel floor tiles to just floor tiles, seeing as they're not made out of plasteel. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3154 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
+2
-2
@@ -1069,8 +1069,8 @@
|
||||
origin_tech = "materials=2"
|
||||
|
||||
/obj/item/stack/tile/plasteel
|
||||
name = "plasteel tiles"
|
||||
singular_name = "plasteel floor tile"
|
||||
name = "floor tiles"
|
||||
singular_name = "floor tile"
|
||||
desc = "Those could work as a pretty decent throwing weapon"
|
||||
icon_state = "tile"
|
||||
w_class = 3.0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/structure/closet/syndicate/personal/New()
|
||||
..()
|
||||
sleep(2)
|
||||
new /obj/item/weapon/tank/jetpack(src)
|
||||
new /obj/item/weapon/tank/jetpack/oxygen(src)
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/clothing/under/syndicate(src)
|
||||
new /obj/item/clothing/head/helmet/space/syndicate(src)
|
||||
|
||||
@@ -71,6 +71,10 @@
|
||||
icon_state = "voidjetpack"
|
||||
item_state = "jetpack-void"
|
||||
|
||||
New()
|
||||
..()
|
||||
src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
|
||||
return
|
||||
|
||||
/obj/item/weapon/tank/jetpack/oxygen
|
||||
name = "Jetpack (Oxygen)"
|
||||
@@ -93,6 +97,5 @@
|
||||
..()
|
||||
src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
|
||||
src.ion_trail.set_up(src)
|
||||
src.air_contents.oxygen = 0
|
||||
src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
|
||||
return
|
||||
@@ -415,7 +415,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
||||
M.equip_if_possible(new /obj/item/clothing/under/color/grey(M), M.slot_w_uniform)
|
||||
M.equip_if_possible(new /obj/item/clothing/suit/space(M), M.slot_wear_suit)
|
||||
M.equip_if_possible(new /obj/item/clothing/head/helmet/space(M), M.slot_head)
|
||||
var /obj/item/weapon/tank/jetpack/J = new /obj/item/weapon/tank/jetpack(M)
|
||||
var /obj/item/weapon/tank/jetpack/J = new /obj/item/weapon/tank/jetpack/oxygen(M)
|
||||
M.equip_if_possible(J, M.slot_back)
|
||||
J.toggle()
|
||||
M.equip_if_possible(new /obj/item/clothing/mask/breath(M), M.slot_wear_mask)
|
||||
|
||||
@@ -303,8 +303,8 @@
|
||||
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
|
||||
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
|
||||
|
||||
B1.reagents.add_reagent("fluorosurfactant", 30)
|
||||
B2.reagents.add_reagent("water", 10)
|
||||
B1.reagents.add_reagent("fluorosurfactant", 40)
|
||||
B2.reagents.add_reagent("water", 40)
|
||||
B2.reagents.add_reagent("cleaner", 10)
|
||||
|
||||
beakers += B1
|
||||
|
||||
-3734
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user