cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

#undef is now required for all file defines (#24091)

Browse Source 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
This commit is contained in:
Contrabang
2024-03-11 14:03:30 -04:00
committed by GitHub
parent 47f3b87a9f
commit e32544e599
172 changed files with 1412 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition.dm
+5 -8
View File
@@ -111,9 +111,6 @@
/obj/item/ammo_casing/emp_act(severity)
BB?.emp_act(severity)
#define AMMO_MULTI_SPRITE_STEP_NONE null
#define AMMO_MULTI_SPRITE_STEP_ON_OFF -1
//Boxes of ammo
/obj/item/ammo_box
name = "ammo box (generic)"
@@ -131,7 +128,7 @@
var/list/stored_ammo = list()
var/ammo_type = /obj/item/ammo_casing
var/max_ammo = 7
var/multi_sprite_step = AMMO_MULTI_SPRITE_STEP_NONE // see update_icon_state() for details
var/multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_NONE // see update_icon_state() for details
var/caliber
var/multiload = 1
var/slow_loading = FALSE
@@ -232,17 +229,17 @@
update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
// `multi_sprite_step` governs whether there are different sprites for different degrees of being loaded.
// AMMO_MULTI_SPRITE_STEP_NONE - just a single `icon_state`, no shenanigans
// AMMO_MULTI_SPRITE_STEP_ON_OFF - empty sprite `[icon_state]-0`, full sprite `[icon_state]`, no inbetween
// AMMO_BOX_MULTI_SPRITE_STEP_NONE - just a single `icon_state`, no shenanigans
// AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF - empty sprite `[icon_state]-0`, full sprite `[icon_state]`, no inbetween
// (positive integer) - sprites for intermediate degrees of being loaded are present in the .dmi
// and are named `[icon_state]-[ammo_count]`, with `ammo_count` being incremented in steps of `multi_sprite_step`
// ... except the very final full mag sprite with is just `[icon_state]`
/obj/item/ammo_box/update_icon_state()
var/icon_base = initial(icon_state)
switch(multi_sprite_step)
if(AMMO_MULTI_SPRITE_STEP_NONE)
if(AMMO_BOX_MULTI_SPRITE_STEP_NONE)
icon_state = icon_base
if(AMMO_MULTI_SPRITE_STEP_ON_OFF)
if(AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF)
icon_state = "[icon_base][length(stored_ammo) ? "" : "-0"]"
else
var/shown_ammo = CEILING(length(stored_ammo), multi_sprite_step)
code/modules/projectiles/ammunition/magazines.dm
+6 -6
View File
@@ -202,7 +202,7 @@
ammo_type = /obj/item/ammo_casing/c10mm
caliber = "10mm"
max_ammo = 8
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/m10mm/fire
name = "pistol magazine (10mm incendiary)"
@@ -419,7 +419,7 @@
icon_state = "75"
ammo_type = /obj/item/ammo_casing/caseless/a75
caliber = "75"
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
max_ammo = 8
/obj/item/ammo_box/magazine/m556
@@ -429,7 +429,7 @@
ammo_type = /obj/item/ammo_casing/a556
caliber = "a556"
max_ammo = 30
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/m556/arg
name = "\improper ARG magazine (5.56mm)"
@@ -443,7 +443,7 @@
ammo_type = /obj/item/ammo_casing/a545
caliber = "a545"
max_ammo = 30
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/m12g
name = "shotgun magazine (12g slugs)"
@@ -453,7 +453,7 @@
origin_tech = "combat=3;syndicate=1"
caliber = "shotgun"
max_ammo = 8
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/m12g/buckshot
name = "shotgun magazine (12g buckshot slugs)"
@@ -522,7 +522,7 @@
name = "foam force pistol magazine"
icon_state = "9x19p"
max_ammo = 8
multi_sprite_step = AMMO_MULTI_SPRITE_STEP_ON_OFF
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/toy/pistol/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
code/modules/projectiles/guns/energy/special_eguns.dm
+2 -2
View File
@@ -765,7 +765,7 @@
if(!C)
return
C.linked_gun_UID = null
if(C.mode == MODE_DET)
if(C.mode == PINPOINTER_MODE_DET)
C.stop_tracking()
linked_pinpointer_UID = null
tracking_target_UID = null
@@ -833,7 +833,7 @@
/obj/item/gun/energy/detective/proc/stop_pointing()
if(linked_pinpointer_UID)
var/obj/item/pinpointer/crew/C = locateUID(linked_pinpointer_UID)
if(C?.mode == MODE_DET)
if(C?.mode == PINPOINTER_MODE_DET)
C.stop_tracking()
tracking_target_UID = null
code/modules/projectiles/projectile_base.dm
+1 -1
View File
@@ -149,7 +149,7 @@
if(impact_effect_type && !hitscan)
new impact_effect_type(target_loca, hitx, hity)
W.add_dent(WALL_DENT_SHOT, hitx, hity)
W.add_dent(PROJECTILE_IMPACT_WALL_DENT_SHOT, hitx, hity)
return 0
if(alwayslog)
add_attack_logs(firer, target, "Shot with a [type]")