Skip to content

Commit c87c5b6

Browse files
TheChosenEvilOneTheChosenEvilOne
authored
The Big Wound Removal (#332)
* CBT from wikipedia the free encylopedia at en.wikipedia.org * aeiou * removes more scar related stuff. * yeaahhhh... pain * fixes gauze, shooting yourself, and heparin. * extra bleeding on neck slice
1 parent 536476d commit c87c5b6

File tree

238 files changed

+385
-5237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+385
-5237
lines changed

‎_maps/map_files/PubbyStation/PubbyStation.dmm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46025,7 +46025,6 @@
4602546025
},
4602646026
/obj/effect/turf_decal/tile/blue,
4602746027
/obj/item/surgicaldrill,
46028-
/obj/item/bonesetter,
4602946028
/turf/open/floor/iron/white,
4603046029
/area/medical/surgery)
4603146030
"ehK" = (
@@ -48633,7 +48632,6 @@
4863348632
dir = 4
4863448633
},
4863548634
/obj/effect/turf_decal/tile/blue,
48636-
/obj/item/stack/medical/bone_gel,
4863748635
/obj/effect/turf_decal/tile/blue{
4863848636
dir = 8
4863948637
},

‎code/__DEFINES/DNA.dm‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,12 @@
136136
#define AGENDER 16
137137
/// Do not draw eyes or eyeless overlay
138138
#define NOEYESPRITES 17
139-
/// Used for determining which wounds are applicable to this species.
140-
/// if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD)
141-
#define HAS_FLESH 18
142-
/// if we have bones (can suffer bone wounds)
143-
#define HAS_BONE 19
144139
///If we have a limb-specific overlay sprite
145-
#define HAS_MARKINGS 20
140+
#define HAS_MARKINGS 18
146141
/// Do not draw blood overlay
147-
#define NOBLOODOVERLAY 21
142+
#define NOBLOODOVERLAY 19
148143
///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png
149-
#define NOAUGMENTS 22
144+
#define NOAUGMENTS 20
150145

151146
//organ slots
152147
#define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator"

‎code/__DEFINES/atmospherics.dm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,6 @@
205205
/// This also affects how fast the body normalises it's temperature when cold.
206206
/// 270k is about -3c, that is below freezing and would hurt over time.
207207
#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40)
208-
/// The body temperature limit the human body can take before it will take wound damage.
209-
#define BODYTEMP_HEAT_WOUND_LIMIT (BODYTEMP_NORMAL + 90) // 400.5 k
210208
/// The modifier on cold damage limit hulks get ontop of their regular limit
211209
#define BODYTEMP_HULK_COLD_DAMAGE_LIMIT_MODIFIER 25
212210
/// The modifier on cold damage hulks get.

‎code/__DEFINES/combat.dm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
#define ACID "acid"
4040
/// Involves magic.
4141
#define MAGIC "magic"
42-
/// Involved in checking the likelyhood of applying a wound to a mob.
43-
#define WOUND "wound"
4442

4543
// Weather immunities //
4644
#define WEATHER_STORM "storm"

‎code/__DEFINES/dcs/signals.dm‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -656,15 +656,10 @@
656656
#define COMSIG_ON_CARBON_SLIP "carbon_slip"
657657
///When a carbon gets a vending machine tilted on them
658658
#define COMSIG_ON_VENDOR_CRUSH "carbon_vendor_crush"
659-
// /mob/living/carbon physiology signals
660-
#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
661-
#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L)
662659
///from base of /obj/item/bodypart/proc/attach_limb(): (new_limb, special) allows you to fail limb attachment
663660
#define COMSIG_CARBON_ATTACH_LIMB "carbon_attach_limb"
664661
#define COMPONENT_NO_ATTACH (1<<0)
665662
#define COMSIG_CARBON_REMOVE_LIMB "carbon_remove_limb" //from base of /obj/item/bodypart/proc/drop_limb(special, dismembered)
666-
#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze)
667-
#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption
668663

669664
///from base of mob/living/carbon/soundbang_act(): (list(intensity))
670665
#define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"

‎code/__DEFINES/misc.dm‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,6 @@ GLOBAL_LIST_INIT(pda_styles, sort_list(list(MONO, VT, ORBITRON, SHARE)))
424424
#define LOCATIONS_FILE "locations.json"
425425
#define WANTED_FILE "wanted_message.json"
426426
#define VISTA_FILE "steve.json"
427-
#define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json"
428-
#define BONE_SCAR_FILE "wounds/bone_scar_desc.json"
429-
#define SCAR_LOC_FILE "wounds/scar_loc.json"
430427
#define EXODRONE_FILE "exodrone.json"
431428
#define CLOWN_NONSENSE_FILE "clown_nonsense.json"
432429

‎code/__DEFINES/mobs.dm‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,12 @@
103103
#define TRAUMA_RESILIENCE_BASIC 1 //Curable with chems
104104
#define TRAUMA_RESILIENCE_SURGERY 2 //Curable with brain surgery
105105
#define TRAUMA_RESILIENCE_LOBOTOMY 3 //Curable with lobotomy
106-
#define TRAUMA_RESILIENCE_WOUND 4 //Curable by healing the head wound
107-
#define TRAUMA_RESILIENCE_MAGIC 5 //Curable only with magic
108-
#define TRAUMA_RESILIENCE_ABSOLUTE 6 //This is here to stay
106+
#define TRAUMA_RESILIENCE_MAGIC 4 //Curable only with magic
107+
#define TRAUMA_RESILIENCE_ABSOLUTE 5 //This is here to stay
109108

110109
//Limit of traumas for each resilience tier
111110
#define TRAUMA_LIMIT_BASIC 3
112111
#define TRAUMA_LIMIT_SURGERY 2
113-
#define TRAUMA_LIMIT_WOUND 2
114112
#define TRAUMA_LIMIT_LOBOTOMY 3
115113
#define TRAUMA_LIMIT_MAGIC 3
116114
#define TRAUMA_LIMIT_ABSOLUTE INFINITY

‎code/__DEFINES/obj_flags.dm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
/// Flags for the gun_flags var for firearms
8282
#define TOY_FIREARM_OVERLAY (1<<0) // If update_overlay would add some indicator that the gun is a toy, like a plastic cap on a pistol
8383

84-
/// Flags for sharpness in obj/item
85-
#define SHARP_EDGED (1<<0)
86-
#define SHARP_POINTY (1<<1)
84+
/// Sharpness in obj/item
85+
#define SHARP_POINTY 1
86+
#define SHARP_EDGED 2

‎code/__DEFINES/status_effects.dm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737

3838
#define STATUS_EFFECT_ANTIMAGIC /datum/status_effect/antimagic //grants antimagic (and reapplies if lost) for the duration
3939

40-
#define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded
41-
4240
#define STATUS_EFFECT_LIGHTNINGORB /datum/status_effect/lightningorb //Speed from a lightning orb!
4341

4442
#define STATUS_EFFECT_MAYHEM /datum/status_effect/mayhem //Total bloodbath. Activated by orb of mayhem pickup/bottle of mayhem item.

‎code/__DEFINES/tools.dm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#define TOOL_DRILL "drill"
1515
#define TOOL_SCALPEL "scalpel"
1616
#define TOOL_SAW "saw"
17-
#define TOOL_BONESET "bonesetter"
1817
#define TOOL_KNIFE "knife"
1918
#define TOOL_BLOODFILTER "bloodfilter"
2019
#define TOOL_ROLLINGPIN "rollingpin"

0 commit comments

Comments
 (0)