cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 03:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-06-17 04:30:06 +02:00
parent 12f84343ab dae1d92832
commit 4864ad384d
116 changed files with 10186 additions and 4123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
-3
View File
@@ -662,9 +662,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
ui.set_auto_update(auto_update)
/obj/item/device/pda/attack_self(mob/user as mob)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/pda)
assets.send(user)
user.set_machine(src)
if(active_uplink_check(user))
code/game/objects/items/weapons/shields_vr.dm
+66 -1
View File
@@ -18,4 +18,69 @@
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi')
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
allowed = list(/obj/item/weapon/melee/fluffstuff/wolfgirlsword)
allowed = list(/obj/item/weapon/melee/fluffstuff/wolfgirlsword)
/obj/item/weapon/shield/riot/explorer
name = "green explorer shield"
desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention."
icon = 'icons/obj/weapons_vr.dmi'
icon_state = "explorer_shield"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi'
)
base_block_chance = 40
slot_flags = SLOT_BACK
var/brightness_on
brightness_on = 4
var/on = 0
var/light_applied
//var/light_overlay
//POURPEL WHY U NO COVER
/obj/item/weapon/shield/riot/explorer/attack_self(mob/user)
if(brightness_on)
if(!isturf(user.loc))
to_chat(user, "You cannot turn the light on while in this [user.loc]")
return
on = !on
to_chat(user, "You [on ? "enable" : "disable"] the shield light.")
update_flashlight(user)
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()
else
return ..(user)
/obj/item/weapon/shield/riot/explorer/proc/update_flashlight(var/mob/user = null)
if(on && !light_applied)
set_light(brightness_on)
light_applied = 1
else if(!on && light_applied)
set_light(0)
light_applied = 0
update_icon(user)
user.update_action_buttons()
light = !light
playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3)
/obj/item/weapon/shield/riot/explorer/update_icon()
if(on)
icon_state = "explorer_shield_lighted"
else
icon_state = "explorer_shield"
/obj/item/weapon/shield/riot/explorer/purple
name = "purple explorer shield"
desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention. This one is POURPEL"
icon_state = "explorer_shield_P"
/obj/item/weapon/shield/riot/explorer/purple/update_icon()
if(on)
icon_state = "explorer_shield_P_lighted"
else
icon_state = "explorer_shield_P"
code/game/objects/items/weapons/storage/backpack_vr.dm
+11 -11
View File
@@ -1,7 +1,7 @@
/obj/item/weapon/storage/backpack/saddlebag
name = "Horse Saddlebags"
desc = "A saddle that holds items. Seems slightly bulky."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "saddlebag"
icon_state = "saddlebag"
@@ -33,7 +33,7 @@
/obj/item/weapon/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs
name = "Taur Saddlebags"
desc = "A saddle that holds items. Seems slightly bulky."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "saddlebag"
icon_state = "saddlebag"
@@ -108,7 +108,7 @@
/obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs
name = "Robust Saddlebags"
desc = "A saddle that holds items. Seems robust."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "robustsaddle"
icon_state = "robustsaddle"
@@ -117,7 +117,7 @@
/obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs
name = "Taur Duty Vest"
desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "taurvest"
icon_state = "taurvest"
@@ -141,49 +141,49 @@
/obj/item/weapon/storage/backpack/satchel/explorer
name = "explorer satchel"
desc = "A satchel for carrying a large number of supplies easily."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "satchel-explorer"
icon_state = "satchel-explorer"
/obj/item/weapon/storage/backpack/explorer
name = "explorer backpack"
desc = "A backpack for carrying a large number of supplies easily."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "explorerpack"
icon_state = "explorerpack"
/obj/item/weapon/storage/backpack/satchel/roboticist
name = "roboticist satchel"
desc = "A satchel for carrying a large number of spare parts easily."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "satchel-robo"
icon_state = "satchel-robo"
/obj/item/weapon/storage/backpack/roboticist
name = "roboticist backpack"
desc = "A backpack for carrying a large number of spare parts easily."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "backpack-robo"
icon_state = "backpack-robo"
/obj/item/weapon/storage/backpack/vietnam
name = "vietnam backpack"
desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?"
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "nambackpack"
icon_state = "nambackpack"
/obj/item/weapon/storage/backpack/russian
name = "russian backpack"
desc = "Useful for carrying large quantities of vodka."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "ru_rucksack"
icon_state = "ru_rucksack"
/obj/item/weapon/storage/backpack/korean
name = "korean backpack"
desc = "Insert witty description here."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/clothing/backpack_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "kr_rucksack"
icon_state = "kr_rucksack"
code/game/objects/items/weapons/tanks/tank_types.dm
+1 -1
View File
@@ -102,7 +102,7 @@
/obj/item/weapon/tank/vox/Initialize()
. = ..()
air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
/obj/item/weapon/tank/phoron/pressurized
name = "fuel can"
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+1
View File
@@ -85,6 +85,7 @@
icon_override = 'icons/mob/belt_vr.dmi'
icon_state = "emergency_phoron_vox"
gauge_icon = "indicator_smalltank"
volume = 6
gauge_cap = 3
/obj/item/weapon/tank/nitrogen
code/game/objects/random/misc_vr.dm
+11
View File
@@ -0,0 +1,11 @@
//This file is for VR only
/obj/random/explorer_shield
name = "random explorer shield"
desc = "This is a random shield for the explorer lockers."
icon = 'icons/obj/weapons_vr.dmi'
icon_state = "explorer_shield"
/obj/random/explorer_shield/item_to_spawn()
return pick(/obj/item/weapon/shield/riot/explorer,
/obj/item/weapon/shield/riot/explorer/purple)
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+19 -1
View File
@@ -177,6 +177,7 @@
/obj/item/weapon/material/knife/machete/deluxe,
/obj/item/weapon/gun/energy/locked/frontier/carbine,
/obj/item/clothing/accessory/holster/machete,
/obj/random/explorer_shield,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/cataloguer/compact/pathfinder)
@@ -214,6 +215,23 @@
starts_with = list(
/obj/item/clothing/suit/space/void/autolok,
/obj/item/weapon/tank/emergency/oxygen/double,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/device/suit_cooling_unit/emergency
)
/obj/structure/closet/emergsuit_wall
name = "emergency suit storage"
desc = "It's wall-mounted storage unit for an emergency suit."
icon = 'icons/obj/closets/bases/wall.dmi'
closet_appearance = /decl/closet_appearance/wall/emergency
anchored = 1
density = 0
wall_mounted = 1
store_mobs = 0
starts_with = list(
/obj/item/clothing/head/helmet/space/emergency,
/obj/item/clothing/suit/space/emergency,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/device/suit_cooling_unit/emergency
)