Skip to content

Commit

Permalink
General:
Browse files Browse the repository at this point in the history
Flamethrower construction code cleaned up.
Signalers on doors should work fine now.
Changelog Updated.

Weapons:
Xbow radiation has been lowered from 100 to 20 and it has a 5% chance to do no rad damage

Admin:
Attempted to clean up the code a bit
Commands Removed/CommentedOut:
air_status,  radio_report,  toggletintedweldhelmets, modifytemperature, givetestverbs, restartcontroller, fix_next_move, Cell
Renamed: 
edit_memory - show_traitor_panel
un\stealthadmin - show/hide_verbs

Cargo:
Engineering crates cost 10 and contain: 1 mechanical toolbox, 1 electrical toolbox, 1 glove, 1 toolbelt, 1 vest, and 1 hard hat.
PowerCell crates cost 10 and contain: 1 electrical toolbox, 2 wire coils, 2 power cells, and 1 high power cell.
Water/Fuel tank crates cost 15 and contain: 1 water tank and 1 fuel tank.

Cyborg:
Fixed the open cover icons
To override a cyborg's laws you must emag it when the cover is open
Emags can now unlock the cover

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1995 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
mport2004@gmail.com committed Aug 9, 2011
1 parent b373917 commit 6980602
Show file tree
Hide file tree
Showing 24 changed files with 705 additions and 1,986 deletions.
36 changes: 26 additions & 10 deletions code/defines/obj/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,22 +285,38 @@
containertype = "/obj/crate"
containername = "Glass sheets crate"



/datum/supply_packs/engineering
name = "Engineering crate"
contains = list("/obj/item/weapon/storage/toolbox/electrical",
contains = list("/obj/item/weapon/storage/toolbox/mechanical",
"/obj/item/weapon/storage/toolbox/electrical",
"/obj/item/clothing/head/helmet/welding",
"/obj/item/clothing/head/helmet/welding",
"/obj/item/weapon/cell", // -- TLE
"/obj/item/weapon/cell",
"/obj/item/clothing/gloves/yellow",
"/obj/item/clothing/gloves/yellow")
cost = 5
"/obj/item/weapon/storage/toolbox/utilitybelt",
"/obj/item/clothing/suit/hazardvest",
"/obj/item/clothing/head/helmet/hardhat")
cost = 10
containertype = "/obj/crate"
containername = "Engineering crate"

/datum/supply_packs/powercell
name = "Power cell crate"
contains = list("/obj/item/weapon/storage/toolbox/electrical",
"/obj/item/weapon/cable_coil",
"/obj/item/weapon/cable_coil",
"/obj/item/weapon/cell",
"/obj/item/weapon/cell",
"/obj/item/weapon/cell/high")
cost = 10
containertype = "/obj/crate"
containername = "Power cell crate"

/datum/supply_packs/waterfueltank
name = "Water/Fuel tank crate"
contains = list("/obj/reagent_dispensers/watertank",
"/obj/reagent_dispensers/fueltank")
cost = 15
containertype = "/obj/crate"
containername = "Water/Fuel tank crate"

/datum/supply_packs/engine
name = "Emitter crate"
contains = list("/obj/machinery/emitter",
Expand Down Expand Up @@ -403,7 +419,7 @@

/datum/supply_packs/eweapons
name = "Experimental weapons crate"
contains = list("/obj/item/weapon/flamethrower",
contains = list("/obj/item/weapon/flamethrower/full",
"/obj/item/weapon/tank/plasma",
"/obj/item/weapon/tank/plasma",
"/obj/item/weapon/tank/plasma",
Expand Down
91 changes: 0 additions & 91 deletions code/defines/obj/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1489,97 +1489,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
icon_state = "wood_tableparts"
flags = null

/obj/item/weapon/tank
name = "tank"
icon = 'tank.dmi'

var/datum/gas_mixture/air_contents = null
var/distribute_pressure = ONE_ATMOSPHERE
flags = FPRINT | TABLEPASS | CONDUCT | ONBACK

pressure_resistance = ONE_ATMOSPHERE*5

force = 5.0
throwforce = 10.0
throw_speed = 1
throw_range = 4
var/volume = 70

/obj/item/weapon/tank/anesthetic
name = "Gas Tank (Sleeping Agent)"
desc = "Seriously, who uses this anymore?"
icon_state = "anesthetic"
item_state = "an_tank"

/obj/item/weapon/tank/jetpack
name = "Jetpack (Oxygen)"
desc = "A pack of jets it appears."
icon_state = "jetpack0"
var/on = 0.0
w_class = 4.0
item_state = "jetpack"
var/datum/effects/system/ion_trail_follow/ion_trail
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
//volume = 140 //jetpack sould be larger, but then it will never deplete -rastaf0

/obj/item/weapon/tank/jetpack/void_jetpack
name = "Void Jetpack (oxygen)"
desc = "It works well in a void."
icon_state = "voidjetpack0"
item_state = "jetpack"

/obj/item/weapon/tank/jetpack/black_jetpack
name = "Black Jetpack (oxygen)"
desc = "A black model of jetpacks."
icon_state = "black_jetpack0"
item_state = "black_jetpack"

/obj/item/weapon/tank/oxygen
name = "Gas Tank (Oxygen)"
desc = "A tank of oxygen"
icon_state = "oxygen"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD

/obj/item/weapon/tank/oxygen/yellow
name = "Gas Tank (Oxygen)"
desc = "A tank of oxygen meant for firefighters."
icon_state = "oxygen_f"

/obj/item/weapon/tank/oxygen/red
name = "Gas Tank (Oxygen)"
desc = "A tank of oxygen meant for firefighters."
icon_state = "oxygen_fr"

/obj/item/weapon/tank/air
name = "Gas Tank (Air Mix)"
desc = "Mixed anyone?"
icon_state = "oxygen"

/obj/item/weapon/tank/plasma
name = "Gas Tank (BIOHAZARD)"
desc = "Contains dangerous plasma. Do not inhale."
icon_state = "plasma"

/obj/item/weapon/tank/emergency_oxygen
name = "Emergency Oxygen Tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actualy need it."
icon_state = "emergency"
flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
w_class = 2.0
force = 4.0
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)

/obj/item/weapon/tank/emergency_oxygen/engi
icon_state = "emergency_engi"
name = "Engineering Emergency Oxygen Tank"
volume = 6 //Engineers are always superior. -errorage (dangercon 2011)

/obj/item/weapon/tank/emergency_oxygen/double
icon_state = "emergency_double"
name = "Double Emergency Oxygen Tank"
volume = 10 //These have the same emoung of gas in them as air tanks, but can be worn on your belt -errorage (dangercon 2011)

/obj/item/weapon/teleportation_scroll
name = "Teleportation Scroll"
desc = "A scroll for moving around."
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/autolathe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ var/global/list/autolathe_recipes = list( \
)

var/global/list/autolathe_recipes_hidden = list( \
new /obj/item/weapon/flamethrower(), \
new /obj/item/weapon/flamethrower/full(), \
new /obj/item/device/igniter(), \
new /obj/item/device/timer(), \
new /obj/item/weapon/rcd(), \
Expand Down
Loading

0 comments on commit 6980602

Please sign in to comment.