cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added in some new boots for security to use.

Browse Source 
Added in a bulletproof vest and laser protective vest, both spawn in the armory and in armor crates.
Security Officers spawn with their new boots.
Security Lockers now have the new boots inside them.
Some MULEbot patching thanks to Trubble_bass. The PDA list should no longer show the hallway navigation beacons.
Shuttle walls are no longer autosmoothed. This has to be done manually in the map as it was causing some graphical errors.
Added in new boots and armor sprites. Credit goes to Firecage for them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1755 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-07-02 18:37:35 +00:00
parent 6d2331729d
commit 5da34a92ea
16 changed files with 8599 additions and 8579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/shoes.dm
+7 -1
View File
@@ -79,4 +79,10 @@
name = "clown shoes"
icon_state = "clown"
item_state = "clown_shoes"
slowdown = 0
slowdown = 0
/obj/item/clothing/shoes/jackboots
name = "Jackboots"
desc = "Formerly owned by Officer Jack."
icon_state = "jackboots"
item_state = "jackboots"
code/defines/obj/clothing/suit.dm
+16
View File
@@ -318,6 +318,22 @@
slowdown = 2.5
armor = list(melee = 82, bullet = 5, laser = 2, taser = 2, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/bulletproof
name = "Bulletproof Vest"
desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles."
icon_state = "bulletproof"
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(melee = 15, bullet = 70, laser = 20, taser = 10, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/laserproof
name = "Ablative Armor Vest"
desc = "A vest that excels in protecting the wearer against energy projectiles."
icon_state = "armor_reflec"
item_state = "armor_reflec"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(melee = 10, bullet = 5, laser = 65, taser = 25, bomb = 5, bio = 0, rad = 0)
// FIRE SUITS
/obj/item/clothing/suit/fire
code/defines/obj/supplypacks.dm
+243 -255
View File
@@ -15,44 +15,6 @@
containername = "Special Ops crate"
hidden = 1
/datum/supply_packs/wizard
name = "Wizard costume"
contains = list("/obj/item/weapon/staff",
"/obj/item/clothing/suit/wizrobe/fake",
"/obj/item/clothing/shoes/sandal",
"/obj/item/clothing/head/wizard/fake")
cost = 20
containertype = "/obj/crate"
containername = "Wizard costume crate"
/datum/supply_packs/metal50
name = "50 Metal Sheets"
contains = list("/obj/item/stack/sheet/metal")
amount = 50
cost = 15
containertype = "/obj/crate"
containername = "Metal sheets crate"
/datum/supply_packs/glass50
name = "50 Glass Sheets"
contains = list("/obj/item/stack/sheet/glass")
amount = 50
cost = 15
containertype = "/obj/crate"
containername = "Glass sheets crate"
/datum/supply_packs/internals
name = "Internals crate"
contains = list("/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air")
cost = 10
containertype = "/obj/crate/internals"
containername = "Internals crate"
/datum/supply_packs/food
name = "Food crate"
contains = list("/obj/item/weapon/reagent_containers/food/snacks/flour",
@@ -87,6 +49,218 @@
// Don't add living things to crates, that's bad, it will break the shuttle.
/datum/supply_packs/party
name = "Party equipment"
contains = list("/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer")
cost = 20
containertype = "/obj/crate"
containername = "Party equipment"
/datum/supply_packs/internals
name = "Internals crate"
contains = list("/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air")
cost = 10
containertype = "/obj/crate/internals"
containername = "Internals crate"
/datum/supply_packs/evacuation
name = "Emergency equipment"
contains = list("/obj/machinery/bot/floorbot",
"/obj/machinery/bot/floorbot",
"/obj/machinery/bot/medbot",
"/obj/machinery/bot/medbot",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas")
cost = 35
containertype = "/obj/crate/internals"
containername = "Emergency Crate"
/datum/supply_packs/janitor
name = "Janitorial supplies"
contains = list("/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/mop",
"/obj/item/weapon/caution",
"/obj/item/weapon/caution",
"/obj/item/weapon/caution",
"/obj/item/weapon/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/mopbucket")
cost = 10
containertype = "/obj/crate"
containername = "Janitorial supplies"
/obj/item/weapon/storage/lightbox/tubes
/datum/supply_packs/lightbulbs
name = "Replacement lights"
contains = list("/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox")
cost = 5
containertype = "/obj/crate"
containername = "Replacement lights"
/datum/supply_packs/costume
name = "Standard Costume crate"
contains = list("/obj/item/weapon/stamp/clown",
"/obj/item/weapon/storage/backpack/clown",
"/obj/item/clothing/shoes/clown_shoes",
"/obj/item/clothing/mask/gas/clown_hat",
"/obj/item/clothing/under/rank/clown",
"/obj/item/clothing/under/mime",
"/obj/item/clothing/shoes/black",
"/obj/item/clothing/gloves/white",
"/obj/item/clothing/mask/gas/mime",
"/obj/item/clothing/head/beret",
"/obj/item/clothing/suit/suspenders",)
cost = 10
containertype = "/obj/crate/secure/gear"
containername = "Standard Costume"
access = access_theatre
/datum/supply_packs/wizard
name = "Wizard costume"
contains = list("/obj/item/weapon/staff",
"/obj/item/clothing/suit/wizrobe/fake",
"/obj/item/clothing/shoes/sandal",
"/obj/item/clothing/head/wizard/fake")
cost = 20
containertype = "/obj/crate"
containername = "Wizard costume crate"
/datum/supply_packs/mule
name = "MULEbot Crate"
contains = list("/obj/machinery/bot/mulebot")
cost = 20
containertype = "/obj/crate"
containername = "MULEbot Crate"
/datum/supply_packs/hydroponics // -- Skie
name = "Hydroponics Supply Crate"
contains = list("/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/minihoe",
"/obj/item/device/analyzer/plant_analyzer",
"/obj/item/clothing/gloves/botanic_leather",
"/obj/item/clothing/suit/apron") // Updated with new things
cost = 10
containertype = /obj/crate/hydroponics
containername = "Hydroponics crate"
access = access_hydroponics
/datum/supply_packs/seeds
name = "Seeds Crate"
contains = list("/obj/item/seeds/chiliseed",
"/obj/item/seeds/berryseed",
"/obj/item/seeds/corn",
"/obj/item/seeds/eggplantseed",
"/obj/item/seeds/tomatoseed",
"/obj/item/seeds/soyaseed",
"/obj/item/seeds/wheatseed",
"/obj/item/seeds/carrotseed",
"/obj/item/seeds/sunflowerseed",
"/obj/item/seeds/chantermycelium",
"/obj/item/seeds/potatoseed")
cost = 10
containertype = /obj/crate/hydroponics
containername = "Seeds crate"
access = access_hydroponics
/datum/supply_packs/exoticseeds
name = "Exotic Seeds Crate"
contains = list("/obj/item/seeds/nettleseed",
"/obj/item/seeds/plumpmycelium",
"/obj/item/seeds/libertymycelium",
"/obj/item/seeds/amanitamycelium",
"/obj/item/seeds/bananaseed",
"/obj/item/seeds/eggyseed")
cost = 15
containertype = /obj/crate/hydroponics
containername = "Exotic Seeds crate"
access = access_hydroponics
/datum/supply_packs/medical
name = "Medical crate"
contains = list("/obj/item/weapon/storage/firstaid/regular",
"/obj/item/weapon/storage/firstaid/fire",
"/obj/item/weapon/storage/firstaid/toxin",
"/obj/item/weapon/storage/firstaid/o2",
"/obj/item/weapon/reagent_containers/glass/bottle/antitoxin",
"/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline",
"/obj/item/weapon/reagent_containers/glass/bottle/stoxin",
"/obj/item/weapon/storage/syringes")
cost = 10
containertype = "/obj/crate/medical"
containername = "Medical crate"
/datum/supply_packs/virus
name = "Virus crate"
contains = list("/obj/item/weapon/reagent_containers/glass/bottle/flu_virion",
"/obj/item/weapon/reagent_containers/glass/bottle/cold",
"/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs",
"/obj/item/weapon/reagent_containers/glass/bottle/magnitis",
// "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis", worse than GBS if anything
// "/obj/item/weapon/reagent_containers/glass/bottle/gbs", No. Just no.
"/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat",
"/obj/item/weapon/reagent_containers/glass/bottle/brainrot",
"/obj/item/weapon/storage/syringes",
"/obj/item/weapon/storage/beakerbox")
cost = 20
containertype = "/obj/crate/secure/weapon"
containername = "Virus crate"
access = access_heads
/datum/supply_packs/metal50
name = "50 Metal Sheets"
contains = list("/obj/item/stack/sheet/metal")
amount = 50
cost = 15
containertype = "/obj/crate"
containername = "Metal sheets crate"
/datum/supply_packs/glass50
name = "50 Glass Sheets"
contains = list("/obj/item/stack/sheet/glass")
amount = 50
cost = 15
containertype = "/obj/crate"
containername = "Glass sheets crate"
/datum/supply_packs/engineering
name = "Engineering crate"
contains = list("/obj/item/weapon/storage/toolbox/electrical",
@@ -138,73 +312,32 @@
"/obj/particle_accelerator/end_cap")
containername = "Particle Accelerator crate"
/datum/supply_packs/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
contains = list("/obj/item/weapon/book/manual/ripley_build_and_repair",
"/obj/item/mecha_parts/circuitboard/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer
"/obj/item/mecha_parts/circuitboard/ripley/main") //TEMPORARY due to lack of circuitboard printer
cost = 40
containertype = "/obj/crate/secure"
containername = "APLU \"Ripley\" Circuit Crate"
access = access_robotics
/datum/supply_packs/medical
name = "Medical crate"
contains = list("/obj/item/weapon/storage/firstaid/regular",
"/obj/item/weapon/storage/firstaid/fire",
"/obj/item/weapon/storage/firstaid/toxin",
"/obj/item/weapon/storage/firstaid/o2",
"/obj/item/weapon/reagent_containers/glass/bottle/antitoxin",
"/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline",
"/obj/item/weapon/reagent_containers/glass/bottle/stoxin",
"/obj/item/weapon/storage/syringes")
/datum/supply_packs/robotics
name = "Robotics Assembly Crate"
contains = list("/obj/item/device/prox_sensor",
"/obj/item/device/prox_sensor",
"/obj/item/device/prox_sensor",
"/obj/item/weapon/storage/toolbox/electrical",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/weapon/cell/high",
"/obj/item/weapon/cell/high")
cost = 10
containertype = "/obj/crate/medical"
containername = "Medical crate"
/datum/supply_packs/virus
name = "Virus crate"
contains = list("/obj/item/weapon/reagent_containers/glass/bottle/flu_virion",
"/obj/item/weapon/reagent_containers/glass/bottle/cold",
"/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs",
"/obj/item/weapon/reagent_containers/glass/bottle/magnitis",
// "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis", worse than GBS if anything
// "/obj/item/weapon/reagent_containers/glass/bottle/gbs", No. Just no.
"/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat",
"/obj/item/weapon/reagent_containers/glass/bottle/brainrot",
"/obj/item/weapon/storage/syringes",
"/obj/item/weapon/storage/beakerbox")
cost = 20
containertype = "/obj/crate/secure/weapon"
containername = "Virus crate"
access = access_heads
/datum/supply_packs/janitor
name = "Janitorial supplies"
contains = list("/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/reagent_containers/glass/bucket",
"/obj/item/weapon/mop",
"/obj/item/weapon/caution",
"/obj/item/weapon/caution",
"/obj/item/weapon/caution",
"/obj/item/weapon/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/item/weapon/chem_grenade/cleaner",
"/obj/mopbucket")
cost = 10
containertype = "/obj/crate"
containername = "Janitorial supplies"
/obj/item/weapon/storage/lightbox/tubes
/datum/supply_packs/lightbulbs
name = "Replacement lights"
contains = list("/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox")
cost = 5
containertype = "/obj/crate"
containername = "Replacement lights"
containertype = /obj/crate/secure/gear
containername = "Robotics Assembly"
access = access_robotics
/datum/supply_packs/plasma
name = "Plasma assembly crate"
@@ -229,10 +362,10 @@
name = "Weapons crate"
contains = list("/obj/item/weapon/melee/baton",
"/obj/item/weapon/melee/baton",
"/obj/item/weapon/gun/energy/laser_gun",
"/obj/item/weapon/gun/energy/laser_gun",
"/obj/item/weapon/gun/energy/taser_gun",
"/obj/item/weapon/gun/energy/taser_gun",
"/obj/item/weapon/gun/energy/laser",
"/obj/item/weapon/gun/energy/laser",
"/obj/item/weapon/gun/energy/taser",
"/obj/item/weapon/gun/energy/taser",
"/obj/item/weapon/storage/flashbang_kit",
"/obj/item/weapon/storage/flashbang_kit")
cost = 20
@@ -272,25 +405,6 @@
containername = "Riot crate"
access = access_security
/datum/supply_packs/costume
name = "Standard Costume crate"
contains = list("/obj/item/weapon/stamp/clown",
"/obj/item/weapon/storage/backpack/clown",
"/obj/item/clothing/shoes/clown_shoes",
"/obj/item/clothing/mask/gas/clown_hat",
"/obj/item/clothing/under/rank/clown",
"/obj/item/clothing/under/mime",
"/obj/item/clothing/shoes/black",
"/obj/item/clothing/gloves/white",
"/obj/item/clothing/mask/gas/mime",
"/obj/item/clothing/head/beret",
"/obj/item/clothing/suit/suspenders",)
cost = 10
containertype = "/obj/crate/secure/gear"
containername = "Standard Costume"
access = access_theatre
/datum/supply_packs/armor
name = "Armor crate"
contains = list("/obj/item/clothing/head/helmet",
@@ -300,140 +414,14 @@
"/obj/item/clothing/suit/armor/vest",
"/obj/item/clothing/suit/armor/vest",
"/obj/item/clothing/head/helmet/riot",
"/obj/item/clothing/suit/armor/riot",)
"/obj/item/clothing/suit/armor/riot",
"/obj/item/clothing/suit/armor/bulletproof",
"/obj/item/clothing/suit/armor/laserproof",)
cost = 25
containertype = "/obj/crate/secure/gear"
containername = "Armor crate"
access = access_security
/datum/supply_packs/evacuation
name = "Emergency equipment"
contains = list("/obj/machinery/bot/floorbot",
"/obj/machinery/bot/floorbot",
"/obj/machinery/bot/medbot",
"/obj/machinery/bot/medbot",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/weapon/tank/air",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas",
"/obj/item/clothing/mask/gas")
cost = 35
containertype = "/obj/crate/internals"
containername = "Emergency Crate"
/datum/supply_packs/party
name = "Party equipment"
contains = list("/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer",
"/obj/item/weapon/reagent_containers/food/drinks/beer")
cost = 20
containertype = "/obj/crate"
containername = "Party equipment"
/*
/datum/supply_packs/hats
name = "Clown Gear"
contains = list("/obj/item/clothing/head/that",
"/obj/item/clothing/under/psyche",
"/obj/item/clothing/under/johnny",
"/obj/item/clothing/under/mario",
"/obj/item/clothing/under/luigi",
"/obj/item/clothing/head/butt")
cost = 20
containertype = "/obj/crate"
containername = "Clown Gear"
*/
/datum/supply_packs/mule
name = "MULEbot Crate"
contains = list("/obj/machinery/bot/mulebot")
cost = 20
containertype = "/obj/crate"
containername = "MULEbot Crate"
/datum/supply_packs/robotics
name = "Robotics Assembly Crate"
contains = list("/obj/item/device/prox_sensor",
"/obj/item/device/prox_sensor",
"/obj/item/device/prox_sensor",
"/obj/item/weapon/storage/toolbox/electrical",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/device/flash",
"/obj/item/weapon/cell/high",
"/obj/item/weapon/cell/high")
cost = 10
containertype = /obj/crate/secure/gear
containername = "Robotics Assembly"
access = access_robotics
/datum/supply_packs/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
contains = list("/obj/item/weapon/book/manual/ripley_build_and_repair",
"/obj/item/mecha_parts/circuitboard/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer
"/obj/item/mecha_parts/circuitboard/ripley/main") //TEMPORARY due to lack of circuitboard printer
cost = 40
containertype = "/obj/crate/secure"
containername = "APLU \"Ripley\" Circuit Crate"
access = access_robotics
/datum/supply_packs/hydroponics // -- Skie
name = "Hydroponics Supply Crate"
contains = list("/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/minihoe",
"/obj/item/device/analyzer/plant_analyzer",
"/obj/item/clothing/gloves/botanic_leather",
"/obj/item/clothing/suit/apron") // Updated with new things
cost = 10
containertype = /obj/crate/hydroponics
containername = "Hydroponics crate"
access = access_hydroponics
/datum/supply_packs/seeds
name = "Seeds Crate"
contains = list("/obj/item/seeds/chiliseed",
"/obj/item/seeds/berryseed",
"/obj/item/seeds/corn",
"/obj/item/seeds/eggplantseed",
"/obj/item/seeds/tomatoseed",
"/obj/item/seeds/soyaseed",
"/obj/item/seeds/wheatseed",
"/obj/item/seeds/carrotseed",
"/obj/item/seeds/sunflowerseed",
"/obj/item/seeds/chantermycelium",
"/obj/item/seeds/potatoseed")
cost = 10
containertype = /obj/crate/hydroponics
containername = "Seeds crate"
access = access_hydroponics
/datum/supply_packs/exoticseeds
name = "Exotic Seeds Crate"
contains = list("/obj/item/seeds/nettleseed",
"/obj/item/seeds/plumpmycelium",
"/obj/item/seeds/libertymycelium",
"/obj/item/seeds/amanitamycelium",
"/obj/item/seeds/bananaseed",
"/obj/item/seeds/eggyseed")
cost = 15
containertype = /obj/crate/hydroponics
containername = "Exotic Seeds crate"
access = access_hydroponics
/datum/supply_packs/securitybarriers
name = "Security Barriers"
contains = list("/obj/machinery/deployable/barrier",
code/game/jobs/jobprocs.dm
+1 -1
View File
@@ -416,7 +416,7 @@
src.equip_if_possible(new /obj/item/clothing/under/rank/security(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/head/helmet(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/shoes/jackboots(src), slot_shoes)
// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_s_store)
code/game/machinery/bots/mulebot.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/locked = 1
var/atom/movable/load = null // the loaded crate (usually)
var/beacon_freq = 1445
var/beacon_freq = 1400
var/control_freq = 1447
suffix = ""
code/game/objects/closets/secure/security.dm
+1 -1
View File
@@ -9,7 +9,7 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/glasses/sunglasses(src)
code/game/objects/devices/PDA/radio.dm
+1 -1
View File
@@ -115,7 +115,7 @@
var/list/botstatus // the status signal sent by the bot
var/list/beacons
var/beacon_freq = 1445
var/beacon_freq = 1400
var/control_freq = 1447
// create a new QM cartridge, and register to receive bot control & beacon message
code/game/smoothwall.dm
+8 -8
View File
@@ -18,7 +18,7 @@
/* Commenting this out for now until we figure out what to do with shuttle smooth walls, if anything.
As they are now, they sort of work screwy and may need further coding. Or just be scrapped.*/
else
/*else
for(var/turf/simulated/shuttle/wall/W in orange(src,1))
if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
junction |= get_dir(src,W)
@@ -30,7 +30,7 @@
junction |= get_dir(src,W)
for(var/obj/grille/W in orange(src,1)) //same for grilles. checking if area is shuttle so it won't merge with the station
if((abs(src.x-W.x)-abs(src.y-W.y)) && (istype(W.loc.loc,/area/shuttle) || istype(W.loc.loc,/area/supply)))
junction |= get_dir(src,W)
junction |= get_dir(src,W)*/
if(istype(src,/turf/simulated/wall))
var/turf/simulated/wall/wall = src
@@ -39,7 +39,7 @@
src.icon_state = "rwall[junction]"
else if (istype(src,/obj/falsewall))
src.icon_state = "wall[junction]"
else if(istype(src,/turf/simulated/shuttle/wall))
/* else if(istype(src,/turf/simulated/shuttle/wall))
var/newicon = icon;
var/newiconstate = icon_state;
if(junction!=5 && junction!=6 && junction!=9 && junction!=10) //if it's not diagonal, all is well, no additional calculations needed
@@ -69,7 +69,7 @@
src.icon_state = newiconstate; //
src.overlays += icon('shuttle.dmi',"swall_f[junction]")
else //otherwise, the space one
src.icon_state = "swall_s[junction]"
src.icon_state = "swall_s[junction]"*/
return
@@ -93,14 +93,14 @@
..()
/turf/simulated/shuttle/wall/New()
/*/turf/simulated/shuttle/wall/New()
spawn(20) //testing if this will make /obj/machinery/shuttle and /door count - It does, it stays.
if(src.icon_state in list("wall1", "wall", "diagonalWall", "wall_floor", "wall_space")) //so wizard den, syndie shuttle etc will remain black
for(var/turf/simulated/shuttle/wall/W in range(src,1))
W.relativewall()
..()
..()*/
/turf/simulated/wall/Del()
@@ -136,7 +136,7 @@
..()
/turf/simulated/shuttle/wall/Del()
/*/turf/simulated/shuttle/wall/Del()
var/temploc = src.loc
@@ -144,4 +144,4 @@
for(var/turf/simulated/shuttle/wall/W in range(temploc,1))
W.relativewall()
..()
..()*/
icons/mob/feet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

icons/mob/items_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 86 KiB

icons/mob/items_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

icons/mob/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 152 KiB

icons/obj/clothing/shoes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

maps/tgstation.2.0.7.dmm
+8321 -8310
View File
File diff suppressed because it is too large Load Diff
tgstation.dme
-1
View File
@@ -814,5 +814,4 @@
#include "code\WorkInProgress\recycling\scrap.dm"
#include "code\WorkInProgress\recycling\sortingmachinery.dm"
#include "interface\skin.dmf"
#include "maps\TestingMap.dmm"
// END_INCLUDE