cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass I

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-04 05:18:48 -04:00
parent 7c29e59784
commit a019934e9e
80 changed files with 254 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/assembly.dm
+1 -2
View File
@@ -5,8 +5,7 @@
icon_state = ""
flags = CONDUCT
w_class = 2.0
m_amt = 100
g_amt = 0
materials = list(MAT_METAL=100)
throwforce = 2
throw_speed = 3
throw_range = 10
code/modules/assembly/igniter.dm
+1 -2
View File
@@ -2,8 +2,7 @@
name = "igniter"
desc = "A small electronic device able to ignite combustable substances."
icon_state = "igniter"
m_amt = 500
g_amt = 50
materials = list(MAT_METAL=500, MAT_GLASS=50)
w_amt = 10
origin_tech = "magnets=1"
code/modules/assembly/infrared.dm
+1 -2
View File
@@ -2,8 +2,7 @@
name = "infrared emitter"
desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
icon_state = "infrared"
m_amt = 1000
g_amt = 500
materials = list(MAT_METAL=1000, MAT_GLASS=500)
origin_tech = "magnets=2"
bomb_name = "tripwire mine"
code/modules/assembly/mousetrap.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "mousetrap"
desc = "A handy little spring-loaded trap for catching pesty rodents."
icon_state = "mousetrap"
m_amt = 100
materials = list(MAT_METAL=100)
origin_tech = "combat=1"
var/armed = 0
code/modules/assembly/proximity.dm
+1 -2
View File
@@ -2,8 +2,7 @@
name = "proximity sensor"
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
m_amt = 800
g_amt = 200
materials = list(MAT_METAL=800, MAT_GLASS=200)
origin_tech = "magnets=1"
secured = 0
code/modules/assembly/signaler.dm
+2 -3
View File
@@ -3,8 +3,7 @@
desc = "Used to remotely activate devices."
icon_state = "signaller"
item_state = "signaler"
m_amt = 400
g_amt = 120
materials = list(MAT_METAL=400, MAT_GLASS=120)
origin_tech = "magnets=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
@@ -18,7 +17,7 @@
var/delay = 0
var/datum/radio_frequency/radio_connection
var/airlock_wire = null
New()
..()
if(!radio_controller)
code/modules/assembly/timer.dm
+1 -2
View File
@@ -2,8 +2,7 @@
name = "timer"
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
m_amt = 500
g_amt = 50
materials = list(MAT_METAL=500, MAT_GLASS=50)
origin_tech = "magnets=1"
secured = 0
code/modules/assembly/voice.dm
+1 -2
View File
@@ -2,8 +2,7 @@
name = "voice analyzer"
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
m_amt = 500
g_amt = 50
materials = list(MAT_METAL=500, MAT_GLASS=50)
origin_tech = "magnets=1"
var/listening = 0
var/recorded = null //the activation message
code/modules/clothing/head/misc_special.dm
+1 -2
View File
@@ -17,8 +17,7 @@
icon_state = "welding"
flags = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "welding"
m_amt = 1750
g_amt = 400
materials = list(MAT_METAL=1750, MAT_GLASS=400)
var/up = 0
flash_protect = 2
tint = 2
code/modules/clothing/masks/gasmask.dm
+1 -2
View File
@@ -21,8 +21,7 @@
desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
icon_state = "weldingmask"
item_state = "weldingmask"
m_amt = 3000
g_amt = 1000
materials = list(MAT_METAL=4000, MAT_GLASS=2000)
var/up = 0
flash_protect = 2
tint = 2
code/modules/fish/fish_items.dm
+1 -1
View File
@@ -153,7 +153,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
icon_state = "teeth"
force = 2.0
throwforce = 5.0
g_amt = 0
materials = list()
/obj/item/weapon/shard/shark_teeth/New()
src.pixel_x = rand(-5,5)
code/modules/hydroponics/trays/tray_tools.dm
+2 -2
View File
@@ -264,7 +264,7 @@
force = 5.0
throwforce = 7.0
w_class = 2.0
m_amt = 50
materials = list(MAT_METAL=50)
attack_verb = list("slashed", "sliced", "cut", "clawed")
//Hatchets and things to kill kudzu
@@ -281,7 +281,7 @@
throwforce = 15.0
throw_speed = 4
throw_range = 4
m_amt = 15000
materials = list(MAT_METAL=15000)
origin_tech = "materials=2;combat=1"
attack_verb = list("chopped", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
code/modules/mining/mine_items.dm
+2 -2
View File
@@ -58,7 +58,7 @@
throwforce = 10.0
item_state = "pickaxe"
w_class = 4.0
m_amt = 3750 //one sheet, but where can you make them?
materials = list(MAT_METAL=3750) //one sheet, but where can you make them?
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=1;engineering=1"
attack_verb = list("hit", "pierced", "sliced", "attacked")
@@ -151,7 +151,7 @@
throwforce = 4.0
item_state = "shovel"
w_class = 3.0
m_amt = 50
materials = list(MAT_METAL=50)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -21,7 +21,7 @@
w_class = 1.0
throw_speed = 3
throw_range = 7
m_amt = 10
materials = list(MAT_METAL=10)
var/colour = "black" //what colour the ink is!
pressure_resistance = 2
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -444,7 +444,7 @@
item_state = "videocam"
w_class = 2.0
slot_flags = SLOT_BELT
m_amt = 2000
materials = list(MAT_METAL=2000)
var/on = 0
var/obj/machinery/camera/camera
var/icon_on = "videocam_on"
code/modules/paperwork/stamps.dm
+2 -2
View File
@@ -8,7 +8,7 @@
w_class = 1.0
throw_speed = 3
throw_range = 7
m_amt = 60
materials = list(MAT_METAL=60)
_color = "cargo"
pressure_resistance = 2
attack_verb = list("stamped")
@@ -76,7 +76,7 @@
name = "Nanotrasen Representative's rubber stamp"
icon_state = "stamp-cent"
_color = "centcom"
/obj/item/weapon/stamp/syndicate
name = "suspicious rubber stamp"
icon_state = "stamp-syndicate"
code/modules/power/cable.dm
+1 -2
View File
@@ -470,8 +470,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
w_class = 2.0
throw_speed = 2
throw_range = 5
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "coil"
code/modules/power/lighting.dm
+4 -4
View File
@@ -605,7 +605,7 @@
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
m_amt = 60
materials = list(MAT_METAL=60)
var/rigged = 0 // true if rigged to explode
var/brightness_range = 2 //how much light it gives off
var/brightness_power = 1
@@ -617,7 +617,7 @@
icon_state = "ltube"
base_state = "ltube"
item_state = "c_tube"
g_amt = 100
materials = list(MAT_GLASS=100)
brightness_range = 8
brightness_power = 3
@@ -633,7 +633,7 @@
icon_state = "lbulb"
base_state = "lbulb"
item_state = "contvapour"
g_amt = 100
materials = list(MAT_GLASS=100)
brightness_range = 5
brightness_power = 2
brightness_color = "#a0a080"
@@ -648,7 +648,7 @@
icon_state = "fbulb"
base_state = "fbulb"
item_state = "egg4"
g_amt = 100
materials = list(MAT_GLASS=100)
brightness_range = 5
brightness_power = 2
code/modules/projectiles/ammunition.dm
+1 -1
View File
@@ -67,7 +67,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "syringe_kit"
m_amt = 30000
materials = list(MAT_METAL=30000)
throwforce = 2
w_class = 1.0
throw_speed = 4
code/modules/projectiles/ammunition/ammo_casings.dm
+6 -6
View File
@@ -38,7 +38,7 @@
icon_state = "blshell"
caliber = "shotgun"
projectile_type = "/obj/item/projectile/bullet"
m_amt = 4000
materials = list(MAT_METAL=4000)
/obj/item/ammo_casing/shotgun/buckshot
@@ -55,7 +55,7 @@
desc = "A weak beanbag slug for riot control."
icon_state = "bshell"
projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
m_amt = 250
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/improvised
@@ -63,7 +63,7 @@
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
icon_state = "gshell"
projectile_type = "/obj/item/projectile/bullet/pellet/weak"
m_amt = 250
materials = list(MAT_METAL=250)
pellets = 5
deviation = 30
@@ -73,7 +73,7 @@
propellant. It's like playing russian roulette, with a shotgun."
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/random
m_amt = 250
materials = list(MAT_METAL=250)
pellets = 5
deviation = 30
@@ -86,7 +86,7 @@
desc = "A stunning taser slug."
icon_state = "stunshell"
projectile_type = "/obj/item/projectile/bullet/stunshot"
m_amt = 200
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/meteorshot
@@ -164,7 +164,7 @@
desc = "A tranquilizer round used to subdue individuals utilizing stimulants."
icon_state = "cshell"
projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer"
m_amt = 250
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/syringegun
name = "syringe gun spring"
code/modules/projectiles/ammunition/boxes.dm
+4 -4
View File
@@ -54,7 +54,7 @@
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 8
m_amt = 100000
materials = list(MAT_METAL=32000)
/obj/item/ammo_box/shotgun/buck
name = "Ammunition Box (buckshot)"
@@ -63,15 +63,15 @@
/obj/item/ammo_box/shotgun/stun
name = "Ammunition Box (stun shells)"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
m_amt = 20000
materials = list(MAT_METAL=2000)
/obj/item/ammo_box/shotgun/beanbag
name = "Ammunition Box (beanbag shells)"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
m_amt = 4000
materials = list(MAT_METAL=2000)
/obj/item/ammo_box/shotgun/tranquilizer
name = "Ammunition Box (tranquilizer darts)"
icon_state = "45box"
ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
m_amt = 2000
materials = list(MAT_METAL=2000)
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -10,7 +10,7 @@
item_state = "gun"
flags = CONDUCT
slot_flags = SLOT_BELT
m_amt = 2000
materials = list(MAT_METAL=2000)
w_class = 3.0
throwforce = 5
throw_speed = 4
code/modules/projectiles/guns/energy/laser.dm
+1 -1
View File
@@ -6,7 +6,7 @@
fire_sound = 'sound/weapons/Laser.ogg'
charge_cost = 830
w_class = 3.0
m_amt = 2000
materials = list(MAT_METAL=2000)
origin_tech = "combat=3;magnets=2"
projectile_type = "/obj/item/projectile/beam"
code/modules/projectiles/guns/energy/special.dm
+3 -3
View File
@@ -272,7 +272,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
icon_state = "crossbow"
item_state = "crossbow"
w_class = 2
m_amt = 2000
materials = list(MAT_METAL=2000)
origin_tech = "combat=2;magnets=2;syndicate=5"
silenced = 1
projectile_type = "/obj/item/projectile/energy/bolt"
@@ -285,7 +285,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
desc = "A reverse engineered weapon using syndicate technology."
icon_state = "crossbowlarge"
w_class = 3
m_amt = 4000
materials = list(MAT_METAL=4000)
origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
silenced = 0
projectile_type = "/obj/item/projectile/energy/bolt/large"
@@ -294,7 +294,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
desc = "One and done!"
icon_state = "crossbowlarge"
origin_tech = null
m_amt = 0
materials = list()
/obj/item/weapon/gun/energy/plasmacutter
name = "plasma cutter"
code/modules/projectiles/guns/energy/stun.dm
+2 -2
View File
@@ -63,7 +63,7 @@
icon_state = "crossbow"
w_class = 2.0
item_state = "crossbow"
m_amt = 2000
materials = list(MAT_METAL=2000)
origin_tech = "combat=2;magnets=2;syndicate=5"
silenced = 1
fire_sound = 'sound/weapons/Genhit.ogg'
@@ -98,7 +98,7 @@
silenced = 0
w_class = 3.0
force = 10
m_amt = 4000
materials = list(MAT_METAL=4000)
projectile_type = "/obj/item/projectile/energy/bolt/large"
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -8,7 +8,7 @@
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
w_class = 3.0
m_amt = 1000
materials = list(MAT_METAL=1000)
// recoil = 1
var/mag_type = "/obj/item/ammo_box/magazine/m10mm" //Removes the need for max_ammo and caliber info
var/obj/item/ammo_box/magazine/magazine
code/modules/reagents/grenade_launcher.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/ammo_type = /obj/item/weapon/grenade
var/unloaded
m_amt = 2000
materials = list(MAT_METAL=2000)
examine()
set src in view()
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "glass_empty"
amount_per_transfer_from_this = 10
volume = 50
g_amt = 500
materials = list(MAT_GLASS=500)
proc/smash(mob/living/target as mob, mob/living/user as mob)
code/modules/reagents/reagent_containers/glass_containers.dm
+8 -11
View File
@@ -181,8 +181,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
m_amt = 0
g_amt = 500
materials = list(MAT_GLASS=500)
var/obj/item/device/assembly_holder/assembly = null
on_reagent_change()
@@ -276,7 +275,7 @@
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
icon_state = "beakerlarge"
g_amt = 2500
materials = list(MAT_GLASS=2500)
volume = 100
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)
@@ -286,7 +285,7 @@
name = "vial"
desc = "A small glass vial. Can hold up to 25 units."
icon_state = "vial"
g_amt = 250
materials = list(MAT_GLASS=250)
volume = 25
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25)
@@ -296,7 +295,7 @@
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
icon_state = "beakernoreact"
g_amt = 500
materials = list(MAT_GLASS=500)
volume = 50
amount_per_transfer_from_this = 10
flags = OPENCONTAINER | NOREACT
@@ -305,7 +304,7 @@
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units."
icon_state = "beakerbluespace"
g_amt = 5000
materials = list(MAT_GLASS=5000)
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
@@ -335,8 +334,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
m_amt = 200
g_amt = 0
materials = list(MAT_METAL=200)
w_class = 3.0
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(5,10,15,25,30,50,80,100,120)
@@ -357,7 +355,7 @@
name = "vial"
desc = "Small glass vial. Looks fragile."
icon_state = "vial"
g_amt = 500
materials = list(MAT_GLASS=500)
volume = 15
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,5,15)
@@ -386,8 +384,7 @@
icon = 'icons/obj/tank.dmi'
icon_state = "canister"
item_state = "canister"
m_amt = 300
g_amt = 0
materials = list(MAT_METAL=300)
w_class = 4.0
amount_per_transfer_from_this = 20
code/modules/reagents/syringe_gun.dm
+1 -1
View File
@@ -7,7 +7,7 @@
throw_speed = 2
throw_range = 10
force = 4
m_amt = 2000
materials = list(MAT_METAL=2000)
clumsy_check = 0
fire_sound = 'sound/items/syringeproj.ogg'
var/list/syringes = list()
code/modules/research/research.dm
+2 -4
View File
@@ -271,8 +271,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
var/datum/tech/stored
/obj/item/weapon/disk/tech_disk/New()
@@ -286,8 +285,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 1.0
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
var/datum/design/blueprint
/obj/item/weapon/disk/design_disk/New()
code/modules/research/xenoarchaeology/chemistry.dm
+1 -2
View File
@@ -81,8 +81,7 @@ datum
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
icon = 'icons/obj/device.dmi'
icon_state = "solution_tray"
m_amt = 0
g_amt = 5
materials = list(MAT_GLASS=5)
w_class = 1.0
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1, 2)
code/modules/surgery/tools.dm
+6 -12
View File
@@ -3,8 +3,7 @@
desc = "Retracts stuff."
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
m_amt = 6000
g_amt = 3000
materials = list(MAT_METAL=6000, MAT_GLASS=3000)
flags = CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -15,8 +14,7 @@
desc = "You think you have seen this before."
icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
m_amt = 5000
g_amt = 2500
materials = list(MAT_METAL=5000, MAT_GLASS=2500)
flags = CONDUCT
w_class = 1.0
origin_tech = "materials=1;biotech=1"
@@ -28,8 +26,7 @@
desc = "This stops bleeding."
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
m_amt = 2500
g_amt = 750
materials = list(MAT_METAL=2500, MAT_GLASS=750)
flags = CONDUCT
w_class = 1.0
origin_tech = "materials=1;biotech=1"
@@ -42,8 +39,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
hitsound = 'sound/weapons/drill.ogg'
m_amt = 10000
g_amt = 6000
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
flags = CONDUCT
force = 15.0
sharp = 1
@@ -71,8 +67,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 5
m_amt = 4000
g_amt = 1000
materials = list(MAT_METAL=4000, MAT_GLASS=1000)
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -136,8 +131,7 @@
throwforce = 9.0
throw_speed = 3
throw_range = 5
m_amt = 10000
g_amt = 6000
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")