cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-21 15:37:52 +01:00
parent 77e2b692e5 4b0c239157
commit 8e65af20a3
93 changed files with 988 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1
View File
@@ -39,6 +39,7 @@
var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
var/slowdown_accessory = 0 // Updated on accessory add/remove. This is how much the current accessories slow you down.
var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
var/can_embed = 1//If zero, this item/weapon cannot become embedded in people when you hit them with it
var/list/allowed = null //suit storage stuff.
code/game/objects/items/bodybag.dm
+9 -2
View File
@@ -71,7 +71,14 @@
src.name = "body bag - "
src.name += t
playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20)
add_overlay("bodybag_label")
if(istype(buckled_to, /obj/structure/bed/roller))
var/obj/structure/bed/roller/R = buckled_to
if(R.bag_strap)
LAZYREMOVE(overlays, image(R.icon, R.bag_strap))
LAZYADD(overlays, image(icon, "bodybag_label"))
LAZYADD(overlays, image(R.icon, R.bag_strap))
else
LAZYADD(overlays, image(icon, "bodybag_label"))
else
src.name = "body bag"
return
@@ -79,7 +86,7 @@
to_chat(user, "You cut the tag off the bodybag.")
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
src.name = "body bag"
cut_overlays()
LAZYREMOVE(overlays, image(icon, "bodybag_label"))
/obj/structure/closet/body_bag/store_mobs(var/stored_units)
contains_body = ..()
code/game/objects/items/stacks/tiles/tile_types.dm
+4 -4
View File
@@ -193,13 +193,13 @@
/obj/item/stack/tile/floor
name = "floor tile"
singular_name = "floor tile"
desc = "Those could work as a pretty decent throwing weapon" //why?
desc = "Used to cover up your horrible art."
icon_state = "tile"
force = 6.0
force = 6
matter = list(DEFAULT_WALL_MATERIAL = TILE_MATERIAL_AMOUNT)
throwforce = 15.0
throwforce = 6
throw_speed = 5
throw_range = 20
throw_range = 10
flags = CONDUCT
/obj/item/stack/tile/floor_red
code/game/objects/items/weapons/storage/uplink_kits.dm
+2 -2
View File
@@ -220,8 +220,8 @@
starts_with = list(/obj/item/rig_module/electrowarfare_suite = 1, /obj/item/rig_module/voice = 1)
/obj/item/storage/box/syndie_kit/armor
name = "boxed armor kit"
starts_with = list(/obj/item/clothing/suit/storage/vest/merc = 1, /obj/item/clothing/head/helmet/merc = 1, /obj/item/clothing/gloves/arm_guard/mercs = 1, /obj/item/clothing/shoes/leg_guard/merc = 1)
name = "boxed heavy armor kit"
starts_with = list(/obj/item/clothing/suit/armor/carrier/heavy = 1, /obj/item/clothing/head/helmet/merc = 1)
/obj/item/storage/secure/briefcase/money
starts_with = list(/obj/item/spacecash/c1000 = 10)
code/game/objects/items/weapons/vaurca_items.dm
+1 -1
View File
@@ -428,7 +428,7 @@
tension = 1
..()
/obj/item/gun/launcher/crossbow/vaurca/attack_self(mob/living/user as mob)
/obj/item/gun/launcher/crossbow/vaurca/unique_action(mob/living/user)
pump(user)
/obj/item/gun/launcher/crossbow/vaurca/proc/pump(mob/M as mob)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+18 -10
View File
@@ -16,7 +16,7 @@
new /obj/item/storage/backpack/satchel_cap(src)
// Armor
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/suit/storage/vest(src)
new /obj/item/clothing/suit/armor/carrier/generic(src)
//Tools
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
@@ -72,7 +72,7 @@
new /obj/item/storage/box/ids( src )
//Appearance
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/suit/storage/vest(src)
new /obj/item/clothing/suit/armor/carrier/generic(src)
new /obj/item/clothing/head/helmet(src)
//Tools
new /obj/item/device/radio/headset/heads/hop(src)
@@ -124,7 +124,9 @@
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/suit/storage/vest/hos(src)
new /obj/item/clothing/suit/armor/carrier/hos(src)
new /obj/item/clothing/accessory/leg_guard(src)
new /obj/item/clothing/accessory/arm_guard(src)
if(prob(50))
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/head/beret/security/hos(src)
@@ -176,7 +178,9 @@
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/suit/storage/vest/hos(src)
new /obj/item/clothing/suit/armor/carrier/hos(src)
new /obj/item/clothing/accessory/leg_guard(src)
new /obj/item/clothing/accessory/arm_guard(src)
if(prob(50)) // chance to spawn either corporate or regular outfit. to prevent locker bloat which makes it lag when right clicked
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/head/beret/security/hos(src)
@@ -217,7 +221,9 @@
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/suit/storage/vest/warden(src)
new /obj/item/clothing/suit/armor/carrier/officer(src)
new /obj/item/clothing/accessory/arm_guard(src)
new /obj/item/clothing/accessory/leg_guard(src)
if(prob(50))
if(prob(50))
new /obj/item/clothing/under/rank/warden(src)
@@ -229,7 +235,7 @@
new /obj/item/clothing/under/rank/warden/corp(src)
new /obj/item/clothing/head/beret/security/corp(src)
new /obj/item/clothing/head/warden/corp(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/head/helmet/security(src)
new /obj/item/clothing/suit/security/warden(src)
new /obj/item/clothing/accessory/badge/warden(src)
new /obj/item/clothing/gloves/black_leather(src)
@@ -302,7 +308,9 @@
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/suit/storage/vest/officer(src)
new /obj/item/clothing/suit/armor/carrier/officer(src)
new /obj/item/clothing/accessory/arm_guard(src)
new /obj/item/clothing/accessory/leg_guard(src)
if(prob(50))
if(prob(50))
new /obj/item/clothing/under/rank/security(src)
@@ -314,7 +322,7 @@
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/clothing/head/beret/security/corp(src)
new /obj/item/clothing/head/softcap/security/corp(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/head/helmet/security(src)
new /obj/item/clothing/suit/security/officer(src)
new /obj/item/clothing/accessory/badge/officer(src)
new /obj/item/clothing/mask/gas/alt(src)
@@ -383,7 +391,7 @@
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/suit/storage/vest/detective(src)
new /obj/item/clothing/suit/armor/carrier/generic(src)
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
new /obj/item/taperoll/police(src)
//Belts
@@ -403,7 +411,7 @@
//Appearance
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/suit/storage/toggle/forensics(src)
new /obj/item/clothing/suit/storage/vest/ft(src)
new /obj/item/clothing/suit/armor/carrier/generic(src)
new /obj/item/clothing/under/det/forensics(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/classic(src)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2 -3
View File
@@ -256,7 +256,7 @@
iv.pixel_y = 6
overlays += iv
if(bag_strap && istype(buckled, /obj/structure/closet/body_bag))
buckled.overlays += image(icon, bag_strap)
LAZYADD(buckled.overlays, image(icon, bag_strap))
/obj/structure/bed/roller/attackby(obj/item/I, mob/user)
if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I))
@@ -364,8 +364,7 @@
if(iv_attached)
detach_iv(M, usr)
else
MA.overlays.Cut() //Remove straps
MA.update_icon() //Add label back (if it had one)
LAZYREMOVE(MA.overlays, image(icon, bag_strap)) //Remove straps
density = FALSE
MA.pixel_y = 0
update_icon()