shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace all secondary flags with bitflags stored in the flags_2 var

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
+5 -5
View File
@@ -60,7 +60,7 @@
to_chat(owner, "<span class='warning'>You shouldn't be able to toggle a camogear helmetmask if you're not wearing it</span>")
if(new_headgear)
// Force drop the item in the headslot, even though
// it's NODROP
// it's NODROP_1
D.dropItemToGround(target, TRUE)
qdel(old_headgear)
// where is `slot_head` defined? WHO KNOWS
@@ -85,7 +85,7 @@
for(var/V in typesof(chameleon_type))
if(ispath(V) && ispath(V, /obj/item))
var/obj/item/I = V
if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT))
if(chameleon_blacklist[V] || (initial(I.flags_1) & ABSTRACT_1))
continue
if(!initial(I.icon_state) || !initial(I.item_state))
continue
@@ -314,7 +314,7 @@
/obj/item/clothing/head/chameleon/drone
// The camohat, I mean, holographic hat projection, is part of the
// drone itself.
flags = NODROP
flags_1 = NODROP_1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
// which means it offers no protection, it's just air and light
@@ -334,7 +334,7 @@
resistance_flags = 0
armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -362,7 +362,7 @@
/obj/item/clothing/mask/chameleon/drone
//Same as the drone chameleon hat, undroppable and no protection
flags = NODROP
flags_1 = NODROP_1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
// Can drones use the voice changer part? Let's not find out.
vchange = 0
code/modules/clothing/chameleon.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm (rejected hunks)
@@ -384,7 +384,7 @@
item_color = "black"
desc = "A pair of black shoes."
permeability_coefficient = 0.05
- flags = NOSLIP
+ flags_1 = NOSLIP_1
origin_tech = "syndicate=2"
resistance_flags = 0
pockets = /obj/item/storage/internal/pocket/shoes
code/modules/clothing/clothing.dm
+4 -4
View File
@@ -341,7 +341,7 @@ BLIND // can't see anything
src.icon_state = initial(icon_state)
gas_transfer_coefficient = initial(gas_transfer_coefficient)
permeability_coefficient = initial(permeability_coefficient)
flags |= visor_flags
flags_1 |= visor_flags
flags_inv |= visor_flags_inv
flags_cover |= visor_flags_cover
to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
@@ -351,7 +351,7 @@ BLIND // can't see anything
to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
gas_transfer_coefficient = null
permeability_coefficient = null
flags &= ~visor_flags
flags_1 &= ~visor_flags
flags_inv &= ~visor_flags_inv
flags_cover &= ~visor_flags_cover
if(adjusted_flags)
@@ -470,7 +470,7 @@ BLIND // can't see anything
name = "space helmet"
icon_state = "spaceold"
desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
item_state = "spaceold"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
@@ -785,7 +785,7 @@ BLIND // can't see anything
/obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags
up = !up
flags ^= visor_flags
flags_1 ^= visor_flags
flags_inv ^= visor_flags_inv
flags_cover ^= initial(flags_cover)
icon_state = "[initial(icon_state)][up ? "up" : ""]"
code/modules/clothing/clothing.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm (rejected hunks)
@@ -494,7 +494,7 @@ BLIND // can't see anything
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
- flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
slowdown = 1
code/modules/clothing/ears/ears.dm
+1 -5
View File
@@ -15,11 +15,7 @@
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
/obj/item/clothing/ears/earmuffs/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
SET_SECONDARY_FLAG(src, HEALS_EARS)
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
code/modules/clothing/glasses/glasses.dm
+1 -1
View File
@@ -280,7 +280,7 @@
name = "thermoncle"
desc = "Never before has seeing through walls felt so gentlepersonly."
icon_state = "thermoncle"
flags = null //doesn't protect eyes because it's a monocle, duh
flags_1 = null //doesn't protect eyes because it's a monocle, duh
/obj/item/clothing/glasses/thermal/monocle/examine(mob/user) //Different examiners see a different description!
var/desk = desc
code/modules/clothing/glasses/glasses.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm (rejected hunks)
@@ -331,7 +331,7 @@
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
darkness_view = 8
scan_reagents = 1
- flags = NODROP
+ flags_1 = NODROP_1
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
code/modules/clothing/glasses/hud.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/clothing/glasses/hud
name = "HUD"
desc = "A heads-up display that provides important info in (almost) real time."
flags = null //doesn't protect eyes because it's a monocle, duh
flags_1 = null //doesn't protect eyes because it's a monocle, duh
origin_tech = "magnets=3;biotech=2"
var/hud_type = null
code/modules/clothing/head/hardhat.dm
+3 -3
View File
@@ -46,7 +46,7 @@
item_color = "red"
dog_fashion = null
name = "firefighter helmet"
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
@@ -56,7 +56,7 @@
icon_state = "hardhat0_white"
item_state = "hardhat0_white"
item_color = "white"
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
@@ -76,7 +76,7 @@
dog_fashion = null
name = "atmospheric technician's firefighting helmet"
desc = "A firefighter's helmet, able to keep the user cool in any situation."
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
code/modules/clothing/head/helmet.dm
+5 -5
View File
@@ -13,13 +13,13 @@
resistance_flags = 0
flags_cover = HEADCOVERSEYES
flags_inv = HIDEHAIR
flags_2 = BANG_PROTECT_2
dog_fashion = /datum/dog_fashion/head/helmet
/obj/item/clothing/head/helmet/Initialize()
..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
/obj/item/clothing/head/helmet/sec
can_flashlight = 1
@@ -65,7 +65,7 @@
if(world.time > cooldown + toggle_cooldown)
cooldown = world.time
up = !up
flags ^= visor_flags
flags_1 ^= visor_flags
flags_inv ^= visor_flags_inv
flags_cover ^= visor_flags_cover
icon_state = "[initial(icon_state)][up ? "up" : ""]"
@@ -110,7 +110,7 @@
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
strip_delay = 80
dog_fashion = null
@@ -191,11 +191,11 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
strip_delay = 80
dog_fashion = null
// old knight helmets do not offer protection against loud noises
flags_2 = NONE
/obj/item/clothing/head/helmet/knight/Initialize(mapload)
..()
// old knight helmets do not offer protection against loud noises
CLEAR_SECONDARY_FLAG(src, BANG_PROTECT)
/obj/item/clothing/head/helmet/knight/blue
icon_state = "knight_blue"
code/modules/clothing/head/jobs.dm
+1 -1
View File
@@ -110,7 +110,7 @@
/obj/item/clothing/head/beret/highlander
desc = "That was white fabric. <i>Was.</i>"
flags = NODROP
flags_1 = NODROP_1
dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
//Security
code/modules/clothing/head/misc.dm
+1 -1
View File
@@ -219,7 +219,7 @@
icon_state = "shamebrero"
item_state = "shamebrero"
desc = "Once it's on, it never comes off."
flags = NODROP
flags_1 = NODROP_1
dog_fashion = null
/obj/item/clothing/head/cone
code/modules/clothing/masks/breath.dm
+2 -2
View File
@@ -4,8 +4,8 @@
icon_state = "breath"
item_state = "m_mask"
body_parts_covered = 0
flags = MASKINTERNALS
visor_flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
visor_flags = MASKINTERNALS_1
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
code/modules/clothing/masks/gasmask.dm
+7 -7
View File
@@ -2,7 +2,7 @@
name = "gas mask"
desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
icon_state = "gas_alt"
flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_NORMAL
item_state = "gas_alt"
@@ -52,7 +52,7 @@
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
icon_state = "clown"
item_state = "clown_hat"
flags_cover = MASKCOVERSEYES
@@ -84,7 +84,7 @@
/obj/item/clothing/mask/gas/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
icon_state = "sexyclown"
item_state = "sexyclown"
flags_cover = MASKCOVERSEYES
@@ -93,7 +93,7 @@
/obj/item/clothing/mask/gas/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
icon_state = "mime"
item_state = "mime"
flags_cover = MASKCOVERSEYES
@@ -125,7 +125,7 @@
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
icon_state = "monkeymask"
item_state = "monkeymask"
flags_cover = MASKCOVERSEYES
@@ -134,7 +134,7 @@
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
desc = "A traditional female mime's mask."
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
icon_state = "sexymime"
item_state = "sexymime"
flags_cover = MASKCOVERSEYES
@@ -155,7 +155,7 @@
name = "owl mask"
desc = "Twoooo!"
icon_state = "owl"
flags = MASKINTERNALS
flags_1 = MASKINTERNALS_1
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
code/modules/clothing/masks/hailer.dm
+2 -2
View File
@@ -7,10 +7,10 @@
actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust)
icon_state = "sechailer"
item_state = "sechailer"
flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
flags_inv = HIDEFACIALHAIR|HIDEFACE
w_class = WEIGHT_CLASS_SMALL
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
visor_flags = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
visor_flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
code/modules/clothing/shoes/bananashoes.dm
+3 -3
View File
@@ -24,7 +24,7 @@
bananium.use_amount_type(100, MAT_BANANIUM)
if(bananium.amount(MAT_BANANIUM) < 100)
on = !on
flags &= ~NOSLIP
flags_1 &= ~NOSLIP_1
update_icon()
to_chat(loc, "<span class='warning'>You ran out of bananium!</span>")
else
@@ -63,9 +63,9 @@
update_icon()
to_chat(user, "<span class='notice'>You [on ? "activate" : "deactivate"] the prototype shoes.</span>")
if(on)
flags |= NOSLIP
flags_1 |= NOSLIP_1
else
flags &= ~NOSLIP
flags_1 &= ~NOSLIP_1
else
to_chat(user, "<span class='warning'>You need bananium to turn the prototype shoes on!</span>")
code/modules/clothing/shoes/magboots.dm
+3 -3
View File
@@ -22,10 +22,10 @@
/obj/item/clothing/shoes/magboots/attack_self(mob/user)
if(src.magpulse)
src.flags &= ~NOSLIP
src.flags_1 &= ~NOSLIP_1
src.slowdown = SHOES_SLOWDOWN
else
src.flags |= NOSLIP
src.flags_1 |= NOSLIP_1
src.slowdown = slowdown_active
magpulse = !magpulse
icon_state = "[magboot_state][magpulse]"
@@ -37,7 +37,7 @@
A.UpdateButtonIcon()
/obj/item/clothing/shoes/magboots/negates_gravity()
return flags & NOSLIP
return flags_1 & NOSLIP_1
/obj/item/clothing/shoes/magboots/examine(mob/user)
..()
code/modules/clothing/shoes/miscellaneous.dm
+3 -3
View File
@@ -28,7 +28,7 @@
name = "\improper SWAT boots"
desc = "High speed, no drag combat boots."
permeability_coefficient = 0.01
flags = NOSLIP
flags_1 = NOSLIP_1
armor = list(melee = 40, bullet = 30, laser = 25, energy = 25, bomb = 50, bio = 30, rad = 30, fire = 90, acid = 50)
/obj/item/clothing/shoes/sandal
@@ -54,7 +54,7 @@
name = "galoshes"
icon_state = "galoshes"
permeability_coefficient = 0.05
flags = NOSLIP
flags_1 = NOSLIP_1
slowdown = SHOES_SLOWDOWN+1
strip_delay = 50
equip_delay_other = 50
@@ -154,7 +154,7 @@
icon_state = "cultalt"
/obj/item/clothing/shoes/cult/alt/ghost
flags = NODROP|DROPDEL
flags_1 = NODROP_1|DROPDEL_1
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
code/modules/clothing/spacesuits/chronosuit.dm
+7 -7
View File
@@ -95,7 +95,7 @@
teleporting = 0
for(var/obj/item/I in user.held_items)
if(I in hands_nodrop)
I.flags &= ~NODROP
I.flags_1 &= ~NODROP_1
if(camera)
camera.remove_target_ui()
camera.loc = user
@@ -130,9 +130,9 @@
hands_nodrop = list()
for(var/obj/item/I in user.held_items)
if(!(I.flags & NODROP))
if(!(I.flags_1 & NODROP_1))
hands_nodrop += I
I.flags |= NODROP
I.flags_1 |= NODROP_1
user.animate_movement = NO_STEPS
user.changeNext_move(8 + phase_in_ds)
user.notransform = 1
@@ -191,9 +191,9 @@
if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos))
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Mounting /dev/helm")
helmet = user.head
helmet.flags |= NODROP
helmet.flags_1 |= NODROP_1
helmet.suit = src
src.flags |= NODROP
src.flags_1 |= NODROP_1
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting brainwave scanner")
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting ui display driver")
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Initializing chronowalk4-view")
@@ -212,7 +212,7 @@
activating = 1
var/mob/living/carbon/human/user = src.loc
var/hard_landing = teleporting && force
src.flags &= ~NODROP
src.flags_1 &= ~NODROP_1
cooldown = world.time + cooldowntime * 1.5
activated = 0
activating = 0
@@ -233,7 +233,7 @@
to_chat(user, "\[ <span style='color: #ff5500;'>ok</span> \] Unmounting /dev/helmet")
to_chat(user, "logout")
if(helmet)
helmet.flags &= ~NODROP
helmet.flags_1 &= ~NODROP_1
helmet.suit = null
helmet = null
if(camera)
code/modules/clothing/spacesuits/flightsuit.dm
+7 -7
View File
@@ -5,7 +5,7 @@
//There is toggleable "stabilizers" that will make momentum go down FAST instead of its normal slow rate
//The suit is heavy and will slow you down on the ground but is a bit faster then usual in air
//The speed at which you drift is determined by your current momentum
//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP.
//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP_1.
//Apparently due to code limitations you have to detect mob movement with.. shoes.
//The object that handles the flying itself - FLIGHT PACK --------------------------------------------------------------------------------------
/obj/item/device/flightpack
@@ -859,9 +859,9 @@
if(suit)
active = toggle
if(active)
src.flags |= NOSLIP
src.flags_1 |= NOSLIP_1
if(!active)
src.flags &= ~NOSLIP
src.flags_1 &= ~NOSLIP_1
/obj/item/clothing/shoes/flightshoes/item_action_slot_check(slot)
if(slot == slot_shoes)
@@ -1043,7 +1043,7 @@
usermessage("You're already wearing something on your back!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(pack,slot_back,0,0,1)
pack.flags |= NODROP
pack.flags_1 |= NODROP_1
resync()
user.visible_message("<span class='notice'>A [pack.name] extends from [user]'s [name] and clamps to their back!</span>")
user.update_inv_wear_suit()
@@ -1057,7 +1057,7 @@
return FALSE
if(pack.flight && forced)
pack.disable_flight(1)
pack.flags &= ~NODROP
pack.flags_1 &= ~NODROP_1
resync()
if(user)
user.transferItemToLoc(pack, src, TRUE)
@@ -1081,14 +1081,14 @@
usermessage("You're already wearing something on your feet!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(shoes,slot_shoes,0,0,1)
shoes.flags |= NODROP
shoes.flags_1 |= NODROP_1
user.visible_message("<span class='notice'>[user]'s [name] extends a pair of [shoes.name] over their feet!</span>")
user.update_inv_wear_suit()
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
deployedshoes = TRUE
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE)
shoes.flags &= ~NODROP
shoes.flags_1 &= ~NODROP_1
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
if(user)
user.transferItemToLoc(shoes, src, TRUE)
code/modules/clothing/spacesuits/hardsuit.dm
+6 -6
View File
@@ -231,7 +231,7 @@
var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
visor_flags = STOPSPRESSUREDMAGE
visor_flags = STOPSPRESSUREDMAGE_1
/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon()
icon_state = "hardsuit[on]-[item_color]"
@@ -251,7 +251,7 @@
name = initial(name)
desc = initial(desc)
set_light(brightness_on)
flags |= visor_flags
flags_1 |= visor_flags
flags_cover |= HEADCOVERSEYES | HEADCOVERSMOUTH
flags_inv |= visor_flags_inv
cold_protection |= HEAD
@@ -260,7 +260,7 @@
name += " (combat)"
desc = alt_desc
set_light(0)
flags &= ~visor_flags
flags_1 &= ~visor_flags
flags_cover &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH)
flags_inv &= ~visor_flags_inv
cold_protection &= ~HEAD
@@ -281,13 +281,13 @@
linkedsuit.name = initial(linkedsuit.name)
linkedsuit.desc = initial(linkedsuit.desc)
linkedsuit.slowdown = 1
linkedsuit.flags |= STOPSPRESSUREDMAGE
linkedsuit.flags_1 |= STOPSPRESSUREDMAGE_1
linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS
else
linkedsuit.name += " (combat)"
linkedsuit.desc = linkedsuit.alt_desc
linkedsuit.slowdown = 0
linkedsuit.flags &= ~(STOPSPRESSUREDMAGE)
linkedsuit.flags_1 &= ~(STOPSPRESSUREDMAGE_1)
linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
linkedsuit.icon_state = "hardsuit[on]-[item_color]"
@@ -641,7 +641,7 @@
icon_state = "ert_medical"
item_state = "ert_medical"
item_color = "ert_medical"
flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP //Dont want people changing into the other teams gear
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1 //Dont want people changing into the other teams gear
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf
armor = list(melee = 0, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 100, rad = 100, fire = 95, acid = 95)
slowdown = 0
code/modules/clothing/spacesuits/miscellaneous.dm
+7 -7
View File
@@ -57,7 +57,7 @@ Contains:
name = "officer's beret"
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
icon_state = "beret_badge"
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
flags_inv = 0
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
strip_delay = 130
@@ -112,7 +112,7 @@ Contains:
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
flags_cover = HEADCOVERSEYES
dog_fashion = /datum/dog_fashion/head/santa
@@ -123,7 +123,7 @@ Contains:
icon_state = "santa"
item_state = "santa"
slowdown = 0
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
allowed = list(/obj/item) //for stuffing exta special presents
@@ -134,7 +134,7 @@ Contains:
icon_state = "pirate"
item_state = "pirate"
armor = list(melee = 30, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 60, acid = 75)
flags = STOPSPRESSUREDMAGE
flags_1 = STOPSPRESSUREDMAGE_1
strip_delay = 40
equip_delay_other = 20
flags_cover = HEADCOVERSEYES
@@ -161,7 +161,7 @@ Contains:
item_color = "ert_commander"
armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
strip_delay = 130
flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1
brightness_on = 7
/obj/item/clothing/suit/space/hardsuit/ert
@@ -261,7 +261,7 @@ Contains:
armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 75, fire = 60, acid = 75) //As whimpy as a space carp
brightness_on = 0 //luminosity when on
actions_types = list()
flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 | NODROP_1
/obj/item/clothing/suit/space/hardsuit/carp
@@ -343,7 +343,7 @@ Contains:
/obj/item/clothing/suit/space/fragile/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(!torn && prob(50))
to_chat(owner, "<span class='warning'>[src] tears from the damage, breaking the air-tight seal!</span>")
src.flags -= STOPSPRESSUREDMAGE
src.flags_1 &= ~STOPSPRESSUREDMAGE_1
src.name = "torn [src]."
src.desc = "A bulky suit meant to protect the user during emergency situations, at least until someone tore a hole in the suit."
src.torn = TRUE
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -363,7 +363,7 @@
item_state = "swat_suit"
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 3
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -372,7 +372,7 @@
/obj/item/clothing/suit/armor/tdome
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 90, acid = 90)
code/modules/clothing/suits/armor.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm (rejected hunks)
@@ -348,7 +348,7 @@
w_class = WEIGHT_CLASS_BULKY
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals/emergency_oxygen)
- flags = THICKMATERIAL
+ flags_1 = THICKMATERIAL_1
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
code/modules/clothing/suits/bio.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "bio"
desc = "A hood that protects the head and face from biological comtaminants."
permeability_coefficient = 0.01
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
resistance_flags = ACID_PROOF
code/modules/clothing/suits/bio.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm (rejected hunks)
@@ -18,7 +18,7 @@
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
- flags = THICKMATERIAL
+ flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 1
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
code/modules/clothing/suits/cloaks.dm
+1 -1
View File
@@ -15,7 +15,7 @@
icon_state = "golhood"
desc = "A hood for a cloak"
body_parts_covered = HEAD
flags = NODROP
flags_1 = NODROP_1
flags_inv = HIDEHAIR|HIDEEARS
/obj/item/clothing/neck/cloak/suicide_act(mob/user)
code/modules/clothing/suits/miscellaneous.dm
+4 -4
View File
@@ -50,7 +50,7 @@
desc = "Suit for a cyborg costume."
icon_state = "death"
item_state = "death"
flags = CONDUCT
flags_1 = CONDUCT_1
fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -213,7 +213,7 @@
desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
icon_state = "ponchoshame"
item_state = "ponchoshame"
flags = NODROP
flags_1 = NODROP_1
/obj/item/clothing/suit/whitedress
name = "white dress"
@@ -270,7 +270,7 @@
icon_state = "bee"
item_state = "labcoat"
body_parts_covered = CHEST|GROIN|ARMS
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
hoodtype = /obj/item/clothing/head/hooded/bee_hood
/obj/item/clothing/head/hooded/bee_hood
@@ -278,7 +278,7 @@
desc = "A hood attached to a bee costume."
icon_state = "bee"
body_parts_covered = HEAD
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
flags_inv = HIDEHAIR|HIDEEARS
/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
code/modules/clothing/suits/utility.dm
+3 -3
View File
@@ -56,7 +56,7 @@
name = "bomb hood"
desc = "Use in case of bomb."
icon_state = "bombsuit"
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
armor = list(melee = 20, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0, fire = 80, acid = 50)
flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
cold_protection = HEAD
@@ -77,7 +77,7 @@
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 2
armor = list(melee = 20, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0, fire = 80, acid = 50)
@@ -108,7 +108,7 @@
name = "radiation hood"
icon_state = "rad"
desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'"
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100, fire = 30, acid = 30)
strip_delay = 60
code/modules/clothing/suits/utility.dm.rej
+19
View File
@@ -0,0 +1,19 @@
diff a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm (rejected hunks)
@@ -21,7 +21,7 @@
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/extinguisher, /obj/item/crowbar)
slowdown = 1
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -124,7 +124,7 @@
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
- flags = THICKMATERIAL
+ flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/geiger_counter)
slowdown = 1.5
code/modules/clothing/under/color.dm
+1 -1
View File
@@ -17,7 +17,7 @@
resistance_flags = 0
/obj/item/clothing/under/color/black/ghost
flags = NODROP|DROPDEL
flags_1 = NODROP_1|DROPDEL_1
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
code/modules/clothing/under/miscellaneous.dm
+1 -1
View File
@@ -387,7 +387,7 @@
/obj/item/clothing/under/kilt/highlander
desc = "You're the only one worthy of this kilt."
flags = NODROP
flags_1 = NODROP_1
/obj/item/clothing/under/sexymime
name = "sexy mime outfit"