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

Adding new flashlight options and old code sprites (#1025)

Browse Source 
Changes:

returned heavy flashlights from old code, some in security, eva storage and engineering
added robust maglights, placed some in security
ported glowsticks from polaris
cameras, recorders and some old code items sprites are being re-added
you can now carry flashlights into your armor
you can now carry wizard related items into the wizard robe and voidsuit
you can now carry chaplain related items into the chaplain hoodie and nun robes
you can now carry chaplain related items into the chaplain hoodie and nun robes
cult hoods now share the same armor values as the robes
This commit is contained in:
Alberyk
2016-10-14 20:38:00 +03:00
committed by skull132
parent 8289c63b42
commit ca6eac9a37
13 changed files with 125 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult_items.dm
+1 -1
View File
@@ -40,7 +40,7 @@
flags_inv = HIDEFACE
flags = HEADCOVERSEYES
body_parts_covered = HEAD|EYES
armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0
code/game/objects/items/devices/flashlight.dm
+99
View File
@@ -98,6 +98,29 @@
brightness_on = 2
w_class = 1
/obj/item/device/flashlight/heavy
name = "heavy duty flashlight"
desc = "A high-luminosity flashlight for specialist duties."
icon_state = "heavyflashlight"
item_state = "heavyflashlight"
brightness_on = 7
w_class = 3
matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 70)
contained_sprite = 1
/obj/item/device/flashlight/maglight
name = "maglight"
desc = "A heavy flashlight designed for security personnel."
icon_state = "maglight"
item_state = "maglight"
force = 10
brightness_on = 5
w_class = 3
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
matter = list(DEFAULT_WALL_MATERIAL = 200,"glass" = 100)
hitsound = 'sound/weapons/smash.ogg'
contained_sprite = 1
// the desk lamps are a bit special
/obj/item/device/flashlight/lamp
@@ -206,3 +229,79 @@
/obj/item/device/flashlight/slime/attack_self(mob/user)
return //Bio-luminescence does not toggle.
//Glowsticks
/obj/item/device/flashlight/glowstick
name = "green glowstick"
desc = "A green military-grade glowstick."
w_class = 2
brightness_on = 3
light_power = 2
light_color = "#49F37C"
icon = 'icons/obj/glowsticks.dmi'
icon_state = "glowstick"
item_state = "glowstick"
contained_sprite = 1
offset_light = 0
diona_restricted_light = 0
var/fuel = 0
/obj/item/device/flashlight/glowstick/New()
fuel = rand(900, 1200)
..()
/obj/item/device/flashlight/glowstick/process()
fuel = max(fuel - 1, 0)
if(!fuel || !on)
turn_off()
if(!fuel)
src.icon_state = "[initial(icon_state)]-empty"
processing_objects -= src
/obj/item/device/flashlight/glowstick/proc/turn_off()
on = 0
update_icon()
/obj/item/device/flashlight/glowstick/attack_self(mob/user)
if(!fuel)
user << "<span class='notice'>\The [src] has already been used.</span>"
return
if(on)
user << "<span class='notice'>\The [src] has already been turned on.</span>"
return
. = ..()
if(.)
user.visible_message("<span class='notice'>[user] cracks and shakes \the [src].</span>", "<span class='notice'>You crack and shake \the [src], turning it on!</span>")
processing_objects += src
/obj/item/device/flashlight/glowstick/red
name = "red glowstick"
desc = "A red military-grade glowstick."
light_color = "#FC0F29"
icon_state = "glowstick_red"
item_state = "glowstick_red"
/obj/item/device/flashlight/glowstick/blue
name = "blue glowstick"
desc = "A blue military-grade glowstick."
light_color = "#599DFF"
icon_state = "glowstick_blue"
item_state = "glowstick_blue"
/obj/item/device/flashlight/glowstick/orange
name = "orange glowstick"
desc = "A orange military-grade glowstick."
light_color = "#FA7C0B"
icon_state = "glowstick_orange"
item_state = "glowstick_orange"
/obj/item/device/flashlight/glowstick/yellow
name = "yellow glowstick"
desc = "A yellow military-grade glowstick."
light_color = "#FEF923"
icon_state = "glowstick_yellow"
item_state = "glowstick_yellow"
code/game/objects/items/weapons/storage/belt.dm
+3 -1
View File
@@ -127,7 +127,9 @@
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/flame/lighter,
/obj/item/clothing/glasses/hud/security,
/obj/item/device/flashlight,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/flare,
/obj/item/device/flashlight/glowstick,
/obj/item/device/pda,
/obj/item/device/radio/headset,
/obj/item/device/hailer,
code/modules/clothing/spacesuits/void/wizard.dm
+1
View File
@@ -38,6 +38,7 @@
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
wizard_garb = 1
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
equipped(var/mob/user)
if(!(user.mind.assigned_role == "Space Wizard"))
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/clothing/suit/armor
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight)
body_parts_covered = UPPER_TORSO|LOWER_TORSO
flags = THICKMATERIAL
@@ -285,7 +285,7 @@
icon_state = "kvest"
item_state = "kvest"
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight)
siemens_coefficient = 0.5
/obj/item/clothing/suit/storage/vest/officer
code/modules/clothing/suits/jobs.dm
+2
View File
@@ -37,6 +37,7 @@
icon_state = "chaplain_hoodie"
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/bible,/obj/item/weapon/nullrod,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
//Chaplain
@@ -47,6 +48,7 @@
item_state = "nun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/bible,/obj/item/weapon/nullrod,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
//Chef
code/modules/clothing/suits/wiz_robe.dm
+1 -1
View File
@@ -53,7 +53,7 @@
gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE
permeability_coefficient = 0.01
armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
allowed = list(/obj/item/weapon/teleportation_scroll)
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
flags_inv = HIDEJUMPSUIT
siemens_coefficient = 0.7
wizard_garb = 1