mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-28 02:21:53 +00:00
5f835bfc26
Please refer to #20867 and #20870 for a easier view of the changes. Those two PRs show all meaningful changes (hopefully) and doesn't show the files changed with just 3 lines changed. This PR does three things: It makes all children of /obj/ use the same damage system. Previously to make your new machine/structure be destroyable you needed to give it a var/health, and its own version of many damage related proc such as bullet_act(), take_damage(), attacked_by(), attack_animal(), attack_hulk(), ex_act(), etc... But now, all /obj/ use the same version of those procs at the /obj/ level in code/game/obj_defense.dm. All these obj share the same necessary vars: obj_integrity (health), max_integrity, integrity_failure (optional, below that health level failure happens), and the armor list var which was previously only for items, as well as the resistance_flags bitfield. When you want your new object to be destroyable, you only have to give it a value for those vars and maybe override one proc if you want a special behavior but that's it. This reorganization removes a lot of copypasta (most bullet_act() version for each obj were nearly identical). Two new elements are added to the armor list var: fire and acid armor values. How much damage an obj take depends on the armor value for each damage category. But some objects are INDESTRUCTIBLE and simply never take any damage no matter the type. The armor categories are: -melee(punches, item attacks, xeno/animal/hulk attacks, blob attacks, thrown weapons) -bullet -laser -energy (used by projectiles like ionrifle, taser, and also by EMPs) -bio (unused for this, only here because clothes use them when worn) -rad (same) -bomb (self-explanatory) -fire (for fire damage, not for heat damage though) -acid For machines and structures, when their health reaches zero the object is not just deleted but gets somewhat forcedeconstructed (the proc used is shared with the actual deconstruction system) which can drops things. To not frustrates players most of these objects drop most of the elements necessary to rebuild them (think window dropping shards). Machines drop a machine frame and all components for example (but the frame can then be itself smashed to pieces). For clothes, when they are damaged, they get a "damaged" overlay, which can also be seen when worn, similar to the "bloody" overlay. It refactors acid. See #20537. Some objects are ACID_PROOF and take no damage from acid, while others take varying amounts of damage depending on their acid armor value. Some objects are even UNACIDABLE, no acid effect can even land on them. Acid on objects can be washed off using water. It changes some aspect of damage from fires. All /obj/ can now take fire damage and be flammable, instead of just items. And instead of having just FLAMMABLE objs that become ON_FIRE as soon as some fire touch them (paper), we now have objects that are non flammable but do take damage from fire and become ashes if their health reaches zero (only for items). The damage taken varies depending on the obj's fire armor value and total health. There's also still obj and items that are FIRE_PROOF (although some might still be melted by lava if they're not LAVA_PROOF). When a mob is on fire, its clothes now take fire damage and can turn to ashes. Similarly, when a mob takes melee damages, its clothes gets damaged a bit and can turn to shreds. You can repair clothes with cloth that is produceable by botany's biogenerator. It also does many minor things: Clicking a structure/machine with an item on help intent never results in an attack (so you don't destroy a structure while trying to figure out which tool to use). I moved a lot of objects away from /obj/effect, it should only be used for visual effects, decals and stuff, not for things you can hit and destroy. I tweaked a bit how clothes shredding from bombs work. I made a machine or structure un/anchorable with the wrench, I don't remember which object... Since I changed the meaning of the FIRE_PROOF bitflag to actually mean fire immune, I'm buffing the slime extract that you apply on items to make them fire proof. well now they're really 100% fire proof! animals with environment_smash = 1 no longer one-hit destroy tables and stuff, we give them a decent obj_damage value so they can destroy most obj relatively fast depending on the animal. Probably a million things I forgot. If you want to know how the damage system works all you need is the three obj vars "obj_integrity", "max_integrity", "integrity_failure", as well as the armor list var and the resistance_flags bitfield, and read the file obj_defense.dm
130 lines
3.3 KiB
Plaintext
130 lines
3.3 KiB
Plaintext
|
|
///////////
|
|
// EASEL //
|
|
///////////
|
|
|
|
/obj/structure/easel
|
|
name = "easel"
|
|
desc = "only for the finest of art!"
|
|
icon = 'icons/obj/artstuff.dmi'
|
|
icon_state = "easel"
|
|
density = 1
|
|
resistance_flags = FLAMMABLE
|
|
obj_integrity = 60
|
|
max_integrity = 60
|
|
var/obj/item/weapon/canvas/painting = null
|
|
|
|
|
|
//Adding canvases
|
|
/obj/structure/easel/attackby(obj/item/I, mob/user, params)
|
|
if(istype(I, /obj/item/weapon/canvas))
|
|
var/obj/item/weapon/canvas/C = I
|
|
user.unEquip(C)
|
|
painting = C
|
|
C.loc = get_turf(src)
|
|
C.layer = layer+0.1
|
|
user.visible_message("<span class='notice'>[user] puts \the [C] on \the [src].</span>","<span class='notice'>You place \the [C] on \the [src].</span>")
|
|
else
|
|
return ..()
|
|
|
|
|
|
//Stick to the easel like glue
|
|
/obj/structure/easel/Move()
|
|
var/turf/T = get_turf(src)
|
|
..()
|
|
if(painting && painting.loc == T) //Only move if it's near us.
|
|
painting.loc = get_turf(src)
|
|
else
|
|
painting = null
|
|
|
|
|
|
//////////////
|
|
// CANVASES //
|
|
//////////////
|
|
|
|
#define AMT_OF_CANVASES 4 //Keep this up to date or shit will break.
|
|
|
|
//To safe memory on making /icons we cache the blanks..
|
|
var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
|
|
|
|
/obj/item/weapon/canvas
|
|
name = "canvas"
|
|
desc = "draw out your soul on this canvas!"
|
|
icon = 'icons/obj/artstuff.dmi'
|
|
icon_state = "11x11"
|
|
resistance_flags = FLAMMABLE
|
|
var/whichGlobalBackup = 1 //List index
|
|
|
|
/obj/item/weapon/canvas/nineteenXnineteen
|
|
icon_state = "19x19"
|
|
whichGlobalBackup = 2
|
|
|
|
/obj/item/weapon/canvas/twentythreeXnineteen
|
|
icon_state = "23x19"
|
|
whichGlobalBackup = 3
|
|
|
|
/obj/item/weapon/canvas/twentythreeXtwentythree
|
|
icon_state = "23x23"
|
|
whichGlobalBackup = 4
|
|
|
|
|
|
//Find the right size blank canvas
|
|
/obj/item/weapon/canvas/proc/getGlobalBackup()
|
|
. = null
|
|
if(globalBlankCanvases[whichGlobalBackup])
|
|
. = globalBlankCanvases[whichGlobalBackup]
|
|
else
|
|
var/icon/I = icon(initial(icon),initial(icon_state))
|
|
globalBlankCanvases[whichGlobalBackup] = I
|
|
. = I
|
|
|
|
|
|
|
|
//One pixel increments
|
|
/obj/item/weapon/canvas/attackby(obj/item/I, mob/user, params)
|
|
//Click info
|
|
var/list/click_params = params2list(params)
|
|
var/pixX = text2num(click_params["icon-x"])
|
|
var/pixY = text2num(click_params["icon-y"])
|
|
|
|
//Should always be true, otherwise you didn't click the object, but let's check because SS13~
|
|
if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
|
|
return
|
|
|
|
//Cleaning one pixel with a soap or rag
|
|
if(istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag))
|
|
//Pixel info created only when needed
|
|
var/icon/masterpiece = icon(icon,icon_state)
|
|
var/thePix = masterpiece.GetPixel(pixX,pixY)
|
|
var/icon/Ico = getGlobalBackup()
|
|
if(!Ico)
|
|
qdel(masterpiece)
|
|
return
|
|
|
|
var/theOriginalPix = Ico.GetPixel(pixX,pixY)
|
|
if(thePix != theOriginalPix) //colour changed
|
|
DrawPixelOn(theOriginalPix,pixX,pixY)
|
|
qdel(masterpiece)
|
|
|
|
//Drawing one pixel with a crayon
|
|
else if(istype(I, /obj/item/toy/crayon))
|
|
var/obj/item/toy/crayon/C = I
|
|
DrawPixelOn(C.paint_color, pixX, pixY)
|
|
else
|
|
return ..()
|
|
|
|
|
|
//Clean the whole canvas
|
|
/obj/item/weapon/canvas/attack_self(mob/user)
|
|
if(!user)
|
|
return
|
|
var/icon/blank = getGlobalBackup()
|
|
if(blank)
|
|
//it's basically a giant etch-a-sketch
|
|
icon = blank
|
|
user.visible_message("<span class='notice'>[user] cleans the canvas.</span>","<span class='notice'>You clean the canvas.</span>")
|
|
|
|
|
|
|
|
#undef AMT_OF_CANVASES
|