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

bloat killer 9000

Browse Source
This commit is contained in:
paprka
2015-01-17 16:36:27 -08:00
parent bd8594dd20
commit a2fe7f0352
18 changed files with 21 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+1 -15
View File
@@ -54,20 +54,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
/obj/item/clothing/suit/greatcoat
name = "greatcoat"
desc = "A Nazi greatcoat."
icon_state = "nazi"
item_state = "nazi"
/obj/item/clothing/suit/johnny_coat
name = "johnny~~ coat"
desc = "Johnny~~"
icon_state = "johnny"
item_state = "johnny"
/obj/item/clothing/suit/justice
name = "justice suit"
desc = "this pretty much looks ridiculous" //Needs no fixing
@@ -214,7 +200,7 @@
name = "bomber jacket"
desc = "Aviators not included."
icon_state = "bomberjacket"
item_state = "johnny"
item_state = "brownjsuit"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
code/modules/clothing/suits/utility.dm
+1 -1
View File
@@ -13,7 +13,7 @@
name = "emergency firesuit"
desc = "A suit that helps protect against fire and heat."
icon_state = "fire"
item_state = "fire_suit"
item_state = "ro_suit"
w_class = 4
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
code/modules/clothing/under/jobs/civilian.dm
+4 -4
View File
@@ -3,9 +3,9 @@
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
icon_state = "ba_suit"
item_state = "ba_suit"
item_color = "ba_suit"
icon_state = "bar_suit"
item_state = "bar_suit"
item_color = "bar_suit"
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -136,7 +136,7 @@
name = "black suit"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
icon_state = "blacksuit"
item_state = "ba_suit"
item_state = "bar_suit"
item_color = "blacksuit"
can_adjust = 1
code/modules/clothing/under/jobs/medsci.dm
-45
View File
@@ -117,48 +117,3 @@
icon_state = "scrubspurple"
item_color = "scrubspurple"
can_adjust = 0
/*
* Medsci, unused (i think) stuff
*/
/obj/item/clothing/under/rank/geneticist_new
desc = "It's made of a special fiber that provides minor protection against biohazards."
name = "geneticist's jumpsuit"
icon_state = "genetics_new"
item_state = "w_suit"
item_color = "genetics_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
can_adjust = 0
/obj/item/clothing/under/rank/chemist_new
desc = "It's made of a special fiber that provides minor protection against biohazards."
name = "chemist's jumpsuit"
icon_state = "chemist_new"
item_state = "w_suit"
item_color = "chemist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
can_adjust = 0
/obj/item/clothing/under/rank/scientist_new
desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
name = "scientist's jumpsuit"
icon_state = "scientist_new"
item_state = "w_suit"
item_color = "scientist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
can_adjust = 0
/obj/item/clothing/under/rank/virologist_new
desc = "Made of a special fiber that gives increased protection against biohazards."
name = "virologist's jumpsuit"
icon_state = "virologist_new"
item_state = "w_suit"
item_color = "virologist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
can_adjust = 0
code/modules/clothing/under/miscellaneous.dm
+7 -14
View File
@@ -134,13 +134,6 @@
fitted = 0
can_adjust = 0
/obj/item/clothing/under/johnny
name = "johnny~~ jumpsuit"
desc = "Johnny~~"
icon_state = "johnny"
item_color = "johnny"
can_adjust = 0
/obj/item/clothing/under/rainbow
name = "rainbow"
desc = "rainbow"
@@ -186,7 +179,6 @@
icon_state = "really_black_suit"
item_state = "bl_suit"
item_color = "black_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/female
name = "executive suit"
@@ -201,7 +193,6 @@
icon_state = "red_suit"
item_state = "r_suit"
item_color = "red_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/charcoal
name = "charcoal suit"
@@ -209,7 +200,6 @@
icon_state = "charcoal_suit"
item_state = "charcoal_suit"
item_color = "charcoal_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
@@ -217,7 +207,6 @@
icon_state = "navy_suit"
item_state = "navy_suit"
item_color = "navy_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/burgundy
name = "burgundy suit"
@@ -225,7 +214,6 @@
icon_state = "burgundy_suit"
item_state = "burgundy_suit"
item_color = "burgundy_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/checkered
name = "checkered suit"
@@ -233,7 +221,6 @@
icon_state = "checkered_suit"
item_state = "checkered_suit"
item_color = "checkered_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/tan
name = "tan suit"
@@ -241,7 +228,13 @@
icon_state = "tan_suit"
item_state = "tan_suit"
item_color = "tan_suit"
can_adjust = 0
/obj/item/clothing/under/suit_jacket/white
name = "white suit"
desc = "A white suit and jacket with a black shirt. You wanna play rough? OKAY!."
icon_state = "white_suit"
item_state = "white_suit"
item_color = "white_suit"
/obj/item/clothing/under/blackskirt
name = "black skirt"
code/modules/clothing/under/pants.dm
-6
View File
@@ -52,12 +52,6 @@
icon_state = "tanpants"
item_color = "tanpants"
/obj/item/clothing/under/pants/blue
name = "blue pants"
desc = "Stylish blue pants. These go well with a lot of clothes."
icon_state = "bluepants"
item_color = "bluepants"
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."
code/modules/mob/living/carbon/human/emote.dm
+1 -14
View File
@@ -184,19 +184,6 @@
else
message = "<B>[src]</B> hugs \himself."
if ("johnny")
var/M
if (param)
M = param
if (!M)
param = null
else
if(miming)
message = "<B>[src]</B> takes a drag from a cigarette and blows \"[M]\" out in smoke."
else
message = "<B>[src]</B> says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows \his name out in smoke."
m_type = 2
if ("me")
if(silent)
return
@@ -316,7 +303,7 @@
m_type = 2
if ("help") //This can stay at the bottom.
src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, johnny, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
else
..(act)
code/modules/mob/new_player/preferences_setup.dm
+2 -2
View File
@@ -85,7 +85,7 @@
else if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(BARTENDER)
clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
clothes_s = new /icon('icons/mob/uniform.dmi', "bar_suit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY)
if(backbag == 2)
@@ -134,7 +134,7 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(CARGOTECH)
clothes_s = new /icon('icons/mob/uniform.dmi', "cargo_s")
clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
code/modules/mob/new_player/sprite_accessories.dm
+2 -2
View File
@@ -274,7 +274,7 @@
icon_state = "hair_reversemohawk"
/datum/sprite_accessory/hair/jensen
name = "Adam Jensen Hair"
name = "Jensen Hair"
icon_state = "hair_jensen"
/datum/sprite_accessory/hair/gelled
@@ -542,7 +542,7 @@
icon_state = "facial_gt"
/datum/sprite_accessory/facial_hair/jensen
name = "Adam Jensen Beard"
name = "Jensen Beard"
icon_state = "facial_jensen"
/datum/sprite_accessory/facial_hair/dwarf
code/modules/projectiles/guns/projectile/launchers.dm
+1 -1
View File
@@ -48,7 +48,7 @@
name = "kinetic speargun"
desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
icon_state = "speargun"
item_state = "misteratmos" //professional asset reuse
item_state = "speargun"
w_class = 4
force = 10
can_suppress = 0