cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Obsolete, Unused, and Unmaintained overrides (#23232)

Browse Source 
* Remove unused override comments and fix a few I found

* remove lighting icon overrides (obsolete)

* remove laz/borg overrides (obsolete)

* Remove the catch-all e-gun override, manually overrides the two severely out of date sprites that we ACTUALLY have updates for

* oop

* removes obsolete surgery table sprite (probably technically too close to Bay's to be using actually)

* Love un-updated pathing

* oop

* this back icon wasn't even on this gun ever was it

* didn't notice this override >:(
This commit is contained in:
OrionTheFox
2023-08-22 14:15:24 -06:00
committed by GitHub
parent 7227f61d8c
commit dcd3fce15f
31 changed files with 25 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -1,5 +1,5 @@
// SUIT STORAGE UNIT /////////////////
/obj/machinery/suit_storage_unit//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/machinery/suit_storage_unit
name = "suit storage unit"
desc = "An industrial unit made to hold and decontaminate irradiated equipment. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit."
icon = 'icons/obj/machines/suit_storage.dmi'
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/item/camera_bug//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/camera_bug //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
name = "camera bug"
desc = "For illicit snooping through the camera network."
icon = 'icons/obj/device.dmi'
code/game/objects/items/devices/desynchronizer.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/desynchronizer//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/desynchronizer //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
name = "desynchronizer"
desc = "An experimental device that can temporarily desynchronize the user from spacetime, effectively making them disappear while it's active."
icon = 'icons/obj/device.dmi'
code/game/objects/items/devices/gps.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/gps //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/gps //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
name = "global positioning system"
desc = "Helping lost spacemen find their way through the planets since 2016."
icon = 'icons/obj/device.dmi'
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/item/multitool//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/multitool //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
icon = 'icons/obj/device.dmi'
code/game/objects/items/storage/bags.dm
+1 -1
View File
@@ -115,7 +115,7 @@
// Mining Satchel
// -----------------------------
/obj/item/storage/bag/ore//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/storage/bag/ore
name = "mining satchel"
desc = "This little bugger can be used to store and transport ores."
icon = 'icons/obj/mining.dmi'
code/modules/mining/equipment/lazarus_injector.dm
+1 -1
View File
@@ -6,7 +6,7 @@
* Becomes malfunctioning when EMP'd.
* If a hostile mob is revived with a malfunctioning injector, it will be hostile to everyone except whoever revived it and gets robust searching enabled.
*/
/obj/item/lazarus_injector //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/lazarus_injector
name = "lazarus injector"
desc = "An injector with a cocktail of nanomachines and chemicals, this device can seemingly raise animals from the dead, making them become friendly to the user. Unfortunately, the process is useless on higher forms of life and incredibly costly, so these were hidden in storage until an executive thought they'd be great motivation for some of their employees."
icon = 'icons/obj/medical/syringe.dmi'
code/modules/mining/equipment/mineral_scanner.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/**********************Mining Scanners**********************/
/obj/item/mining_scanner//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/mining_scanner
desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations."
name = "manual mining scanner"
icon = 'icons/obj/device.dmi'
code/modules/paperwork/folders.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/folder//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/folder
name = "folder"
desc = "A folder."
icon = 'icons/obj/service/bureaucracy.dmi'
code/modules/paperwork/handlabeler.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/hand_labeler//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/hand_labeler //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
name = "hand labeler"
desc = "A combined label printer, applicator, and remover, all in a single portable device. Designed to be easy to operate and use."
icon = 'icons/obj/service/bureaucracy.dmi'
code/modules/photography/camera/camera.dm
+1 -1
View File
@@ -1,7 +1,7 @@
#define CAMERA_PICTURE_SIZE_HARD_LIMIT 21
/obj/item/camera//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/camera
name = "camera"
icon = 'icons/obj/art/camera.dmi'
desc = "A polaroid camera."
code/modules/power/lighting/light.dm
-10
View File
@@ -153,20 +153,10 @@
switch(status) // set icon_states
if(LIGHT_OK)
var/area/local_area = get_area(src)
//SKYRAT EDIT BEGIN - Original
/*
if(low_power_mode || major_emergency || (local_area?.fire))
icon_state = "[base_state]_emergency"
else
icon_state = "[base_state]"
*/
if(low_power_mode)
icon_state = "[base_state]_lpower"
else if(major_emergency || (local_area?.fire))
icon_state = "[base_state]_emergency"
else
icon_state = "[base_state]"
// SKYRAT EDIT END
if(LIGHT_EMPTY)
icon_state = "[base_state]-empty"
if(LIGHT_BURNED)
code/modules/projectiles/guns/energy/energy_gun.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/gun/energy/e_gun //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
/obj/item/gun/energy/e_gun
name = "energy gun"
desc = "A basic hybrid energy gun with two settings: disable and kill."
icon_state = "energy"
@@ -110,7 +110,7 @@
/obj/item/gun/energy/e_gun/turret/add_seclight_point()
return
/obj/item/gun/energy/e_gun/nuclear
/obj/item/gun/energy/e_gun/nuclear //SKYRAT EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
icon_state = "nucgun"
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+2 -2
View File
@@ -546,7 +546,7 @@
//Cosmetic
/obj/item/borg/upgrade/modkit/chassis_mod /////ICON OVERRIDE IN modular_skyrat/modules/aesthetics/guns/icons/energy.dmi
/obj/item/borg/upgrade/modkit/chassis_mod
name = "super chassis"
desc = "Makes your KA yellow. All the fun of having a more powerful KA without actually having a more powerful KA."
cost = 0
@@ -573,7 +573,7 @@
holder.update_held_items()
..()
/obj/item/borg/upgrade/modkit/chassis_mod/orange /////ICON OVERRIDE IN modular_skyrat/modules/aesthetics/guns/icons/energy.dmi
/obj/item/borg/upgrade/modkit/chassis_mod/orange
name = "hyper chassis"
desc = "Makes your KA orange. All the fun of having explosive blasts without actually having explosive blasts."
chassis_icon = "kineticgun_h"
code/modules/projectiles/guns/energy/laser.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/item/gun/energy/laser //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
/obj/item/gun/energy/laser
name = "laser gun"
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
icon_state = "laser"
@@ -89,7 +89,7 @@
///Laser Cannon
/obj/item/gun/energy/lasercannon//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
/obj/item/gun/energy/lasercannon
name = "accelerator laser cannon"
desc = "An advanced laser cannon that does more damage the farther away the target is."
icon_state = "lasercannon"
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/gun/energy/ionrifle
/obj/item/gun/energy/ionrifle //SKYRAT EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE
name = "ion rifle"
desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range."
icon_state = "ionrifle"
icons/obj/medical/surgery_table.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 427 B

modular_skyrat/modules/SEVA_suit/code/seva_obj.dm
+1 -1
View File
@@ -17,7 +17,7 @@
armor_type = /datum/armor/hooded_seva
resistance_flags = FIRE_PROOF
transparent_protection = HIDEJUMPSUIT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/pickaxe)
/datum/armor/hooded_seva
melee = 20
modular_skyrat/modules/aesthetics/guns/code/guns.dm
+5 -72
View File
@@ -40,60 +40,17 @@
/// Maybe don't enable this for shotgun ammo boxes.
var/multitype = TRUE
/obj/item/gun/energy/e_gun
icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi'
worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
worn_icon_state = "energy"
ammo_x_offset = 2
/obj/item/gun/energy/e_gun/advtaser
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/cfa_phalanx
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/mini
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/stun
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/old
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/hos
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/e_gun/dragnet
worn_icon = null
worn_icon_state = "gun"
/obj/item/gun/energy/laser/musket //We need to have this because we overwrote the icon file for laser guns.
icon = 'icons/obj/weapons/guns/energy.dmi'
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
///GUN SPRITE OVERWRITES
/obj/item/gun/energy/ionrifle
icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi'
/obj/item/gun/energy/laser
icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi'
/obj/item/gun/energy/e_gun/stun
charge_sections = 5
ammo_x_offset = 2
/obj/item/gun/energy/ionrifle/carbine
icon = 'icons/obj/weapons/guns/energy.dmi'
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
/obj/item/gun/ballistic/shotgun/riot
name = "\improper Peacekeeper shotgun"
@@ -169,20 +126,6 @@
worn_icon_state = "gun"
worn_icon = null
/obj/item/gun/energy/laser/thermal
icon = 'icons/obj/weapons/guns/energy.dmi'
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
/obj/item/gun/energy/lasercannon
icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
fire_sound_volume = 100
ammo_x_offset = 2
charge_sections = 5
inhand_icon_state = ""
lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi'
/obj/item/gun/energy/e_gun/nuclear/rainbow
name = "fantastic energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell. This one seems quite fancy!"
@@ -228,11 +171,6 @@
/obj/item/gun/energy/e_gun/nuclear/rainbow/emag_act(mob/user, obj/item/card/emag/E)
return FALSE
// We don't customize CTF
/obj/item/gun/energy/laser/instakill/ctf
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
//BEAM SOUNDS
/obj/item/ammo_casing/energy
fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/laser.ogg'
@@ -352,11 +290,6 @@
inhand_icon_state = "arg"
can_suppress = FALSE
//SOLFED PILOT RIFLE GONE, TO BE ADDED TO ERT FACTIONS FOLDER
/obj/item/gun/energy/kinetic_accelerator
icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
/obj/item/gun/ballistic/automatic/surplus
name = "\improper Type-69 surplus rifle"
desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing."
modular_skyrat/modules/aesthetics/guns/icons/energy.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

modular_skyrat/modules/aesthetics/lights/code/lighting.dm
-8
View File
@@ -6,8 +6,6 @@
light_power = 1.25
/obj/machinery/light
icon = 'modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi'
overlay_icon = 'modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi'
brightness = 6.5
fire_brightness = 4.5
fire_colour = COLOR_FIRE_LIGHT_RED
@@ -113,12 +111,6 @@
if(roundstart_flicker)
start_flickering()
/obj/item/light/tube
icon = 'modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi'
lefthand_file = 'modular_skyrat/modules/aesthetics/lights/icons/lights_lefthand.dmi'
righthand_file = 'modular_skyrat/modules/aesthetics/lights/icons/lights_righthand.dmi'
/obj/machinery/light/multitool_act(mob/living/user, obj/item/multitool)
if(!constant_flickering)
balloon_alert(user, "ballast is already working!")
modular_skyrat/modules/aesthetics/lights/icons/lighting.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 78 KiB

modular_skyrat/modules/aesthetics/lights/icons/lighting_overlay.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

modular_skyrat/modules/aesthetics/lights/icons/lights_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 451 B

modular_skyrat/modules/aesthetics/lights/icons/lights_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 452 B

modular_skyrat/modules/aesthetics/surgery/surgery.dm
-2
View File
@@ -1,2 +0,0 @@
/obj/structure/table/optable
icon = 'modular_skyrat/modules/aesthetics/surgery/surgery.dmi'
modular_skyrat/modules/aesthetics/surgery/surgery.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 648 B

modular_skyrat/modules/aesthetics/syringe/syringe.dm
-5
View File
@@ -1,5 +0,0 @@
/obj/item/reagent_containers/borghypo
icon = 'modular_skyrat/modules/aesthetics/syringe/syringe.dmi'
/obj/item/lazarus_injector
icon = 'modular_skyrat/modules/aesthetics/syringe/syringe.dmi'
modular_skyrat/modules/aesthetics/syringe/syringe.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

modular_skyrat/modules/gun_safety/code/safety_additions.dm
+1 -1
View File
@@ -39,7 +39,7 @@
/obj/item/gun/energy/plasmacutter/give_gun_safeties()
return
/obj/item/gun/energy/kinetic_accelerator/give_gun_safeties()
/obj/item/gun/energy/recharge/kinetic_accelerator/give_gun_safeties()
return
// Syringe Guns
tgstation.dme
-2
View File
@@ -5993,8 +5993,6 @@
#include "modular_skyrat\modules\aesthetics\stationobjs\stationobjs.dm"
#include "modular_skyrat\modules\aesthetics\status_display\code\status_display.dm"
#include "modular_skyrat\modules\aesthetics\storage\storage.dm"
#include "modular_skyrat\modules\aesthetics\surgery\surgery.dm"
#include "modular_skyrat\modules\aesthetics\syringe\syringe.dm"
#include "modular_skyrat\modules\aesthetics\telescience\telescience.dm"
#include "modular_skyrat\modules\aesthetics\tools\code\tools.dm"
#include "modular_skyrat\modules\aesthetics\vending\access_vending.dm"