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

kill more conflicts.

Browse Source
This commit is contained in:
KasparoVy
2016-07-05 21:48:27 -04:00
parent c8dca38b6b ef49dcc938
commit 55b138ff57
74 changed files with 353 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_panel.dm
+1 -1
View File
@@ -409,7 +409,7 @@
if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(num2text(world.time / 600 % 60), 2)]:[add_zero(num2text(world.time / 10 % 60), 2)]</B><BR>"
dat += "Round Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]</B><BR>"
dat += "<B>Emergency shuttle</B><BR>"
if(shuttle_master.emergency.mode < SHUTTLE_CALL)
dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"
code/modules/awaymissions/mission_code/spacehotel.dm
-4
View File
@@ -230,19 +230,15 @@
// to check a person into a room; no financial stuff; returns the keycard
/obj/effect/hotel_controller/proc/checkin(roomid, mob/living/carbon/occupant, obj/item/weapon/card/id/id)
if(!istype(occupant))
world << "no occupant"
return null
var/obj/machinery/door/unpowered/hotel_door/D = room_doors["[roomid]"]
if(!D || D.occupant || (occupant in guests))
world << "room occupied"
return null
D.account = get_card_account(id, occupant)
if(!D.account)
world << "no account"
return null
if(!D.account.charge(100, transaction_purpose = "10 minutes", dest_name = name))
world << "xaction failed"
return null
D.occupant = occupant
code/modules/client/preference/loadout/loadout_uniform.dm
+2 -2
View File
@@ -5,9 +5,9 @@
sort_category = "Uniforms and Casual Dress"
/datum/gear/uniform/skirt
display_name = "skirt"
subtype_path = /datum/gear/uniform/skirt
/datum/gear/uniform/skirt
/datum/gear/uniform/skirt/blue
display_name = "plaid skirt, blue"
path = /obj/item/clothing/under/dress/plaid_blue
code/modules/client/preference/preferences.dm
+12 -12
View File
@@ -63,7 +63,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
#define MAX_SAVE_SLOTS 20 // Save slots for regular players
#define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
#define MAX_GEAR_COST 5
#define MAX_GEAR_COST config.max_loadout_points
#define TAB_CHAR 0
#define TAB_GAME 1
@@ -435,9 +435,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/fcolor = "#3366CC"
if(total_cost < MAX_GEAR_COST)
fcolor = "#E67300"
dat += "<table align='center' width='820px'>"
dat += "<tr><td colspan=3><center><b><font color='[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
dat += "<tr><td colspan=3><center><b>"
dat += "<table align='center' width='100%'>"
dat += "<tr><td colspan=4><center><b><font color='[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
dat += "<tr><td colspan=4><center><b>"
var/firstcat = 1
for(var/category in loadout_categories)
@@ -452,22 +452,22 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "</b></center></td></tr>"
var/datum/loadout_category/LC = loadout_categories[gear_tab]
dat += "<tr><td colspan=3><hr></td></tr>"
dat += "<tr><td colspan=3><b><center>[LC.category]</center></b></td></tr>"
dat += "<tr><td colspan=3><hr></td></tr>"
dat += "<tr><td colspan=4><hr></td></tr>"
dat += "<tr><td colspan=4><b><center>[LC.category]</center></b></td></tr>"
dat += "<tr><td colspan=4><hr></td></tr>"
for(var/gear_name in LC.gear)
var/datum/gear/G = LC.gear[gear_name]
var/ticked = (G.display_name in gear)
dat += "<tr style='vertical-align:top;'><td width=15%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?_src_=prefs;preference=gear;toggle_gear=[G.display_name]'>[G.display_name]</a></td>"
dat += "<td width = 5% style='vertical-align:top'>[G.cost]</td>"
dat += "<td width = 5% style='vertical-align:top'>[G.cost]</td><td>"
if(G.allowed_roles)
dat += "<td><font size=2>Restrictions: "
dat += "<font size=2>Restrictions: "
for(var/role in G.allowed_roles)
dat += role + " "
dat += "</font></td>"
dat += "<td><font size=2><i>[G.description]</i></font></td></tr>"
dat += "</font>"
dat += "</td><td><font size=2><i>[G.description]</i></font></td></tr>"
if(ticked)
. += "<tr><td colspan=3>"
. += "<tr><td colspan=4>"
for(var/datum/gear_tweak/tweak in G.gear_tweaks)
. += " <a href='?_src_=prefs;preference=gear;gear=[G.display_name];tweak=\ref[tweak]'>[tweak.get_contents(get_tweak_metadata(G, tweak))]</a>"
. += "</td></tr>"
code/modules/clothing/spacesuits/miscellaneous.dm
+2 -1
View File
@@ -102,7 +102,8 @@
icon_state = "santa"
item_state = "santa"
slowdown = 0
flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE
flags = STOPSPRESSUREDMAGE
flags_size = ONESIZEFITSALL
allowed = list(/obj/item) //for stuffing exta special presents
code/modules/clothing/spacesuits/plasmamen.dm
+2 -2
View File
@@ -11,7 +11,7 @@
flags_inv = HIDEGLOVES|HIDESHOES
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
species_restricted = list("Plasmaman")
flags = STOPSPRESSUREDMAGE | PLASMAGUARD
flags = STOPSPRESSUREDMAGE
icon_state = "plasmaman_suit"
item_state = "plasmaman_suit"
@@ -38,7 +38,7 @@
/obj/item/clothing/head/helmet/space/eva/plasmaman
name = "plasmaman helmet"
desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies."
flags = STOPSPRESSUREDMAGE | PLASMAGUARD
flags = STOPSPRESSUREDMAGE
species_restricted = list("Plasmaman")
icon_state = "plasmaman_helmet0"
code/modules/clothing/suits/armor.dm
+3 -3
View File
@@ -19,7 +19,7 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/vest/jacket
@@ -35,7 +35,7 @@
icon_state = "armor-combat"
item_state = "bulletproof"
blood_overlay_type = "armor"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
@@ -217,7 +217,7 @@
icon_state = "detective-armor"
item_state = "armor"
blood_overlay_type = "armor"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
code/modules/clothing/suits/bio.dm
+2 -1
View File
@@ -16,7 +16,8 @@
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = ONESIZEFITSALL | THICKMATERIAL
flags = THICKMATERIAL
flags_size = ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 1
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
code/modules/clothing/suits/jobs.dm
+3 -3
View File
@@ -52,7 +52,7 @@
item_state = "bio_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
sprite_sheets = list(
@@ -136,7 +136,7 @@
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -173,7 +173,7 @@
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
code/modules/clothing/suits/miscellaneous.dm
+4 -4
View File
@@ -294,7 +294,7 @@
item_state = "straight_jacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
strip_delay = 60
/obj/item/clothing/suit/ianshirt
@@ -437,7 +437,7 @@
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
//swimsuit
/obj/item/clothing/under/swimsuit/
@@ -480,7 +480,7 @@
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
@@ -525,7 +525,7 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
//End of inheritance from Security armour.
code/modules/clothing/under/color.dm
+22 -19
View File
@@ -16,7 +16,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/blackf
name = "feminine black jumpsuit"
@@ -30,17 +30,18 @@
icon_state = "blue"
item_state = "b_suit"
item_color = "blue"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/blue/dodgeball
flags = ONESIZEFITSALL | NODROP
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/green
name = "green jumpsuit"
icon_state = "green"
item_state = "g_suit"
item_color = "green"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
@@ -48,10 +49,11 @@
icon_state = "grey"
item_state = "gy_suit"
item_color = "grey"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/grey/greytide
flags = ONESIZEFITSALL | NODROP
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
@@ -59,7 +61,7 @@
icon_state = "orange"
item_state = "o_suit"
item_color = "orange"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/orange/prison
name = "orange jumpsuit"
@@ -69,7 +71,7 @@
item_color = "orange"
has_sensor = 2
sensor_mode = 3
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
@@ -77,31 +79,32 @@
icon_state = "pink"
item_state = "p_suit"
item_color = "pink"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red
name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
item_color = "red"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red/dodgeball
flags = ONESIZEFITSALL | NODROP
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/white
name = "white jumpsuit"
icon_state = "white"
item_state = "w_suit"
item_color = "white"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
item_color = "yellow"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/psyche
name = "psychedelic jumpsuit"
@@ -122,7 +125,7 @@
name = "aqua jumpsuit"
icon_state = "aqua"
item_color = "aqua"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/purple
name = "purple jumpsuit"
@@ -149,7 +152,7 @@
name = "light brown jumpsuit"
icon_state = "lightbrown"
item_color = "lightbrown"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
@@ -165,7 +168,7 @@
name = "dark blue jumpsuit"
icon_state = "darkblue"
item_color = "darkblue"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/lightred
name = "light red jumpsuit"
@@ -176,7 +179,7 @@
name = "dark red jumpsuit"
icon_state = "darkred"
item_color = "darkred"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red/jersey
name = "red team jersey"
@@ -184,7 +187,7 @@
icon_state = "redjersey"
item_state = "r_suit"
item_color = "redjersey"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/blue/jersey
name = "blue team jersey"
@@ -192,4 +195,4 @@
icon_state = "bluejersey"
item_state = "b_suit"
item_color = "bluejersey"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
code/modules/clothing/under/jobs/civilian.dm
+18 -18
View File
@@ -6,7 +6,7 @@
icon_state = "ba_suit"
item_state = "ba_suit"
item_color = "ba_suit"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -14,7 +14,7 @@
icon_state = "captain"
item_state = "caparmor"
item_color = "captain"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargo
name = "quartermaster's jumpsuit"
@@ -22,7 +22,7 @@
icon_state = "qm"
item_state = "lb_suit"
item_color = "qm"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargo/skirt
name = "quartermaster's jumpskirt"
@@ -30,7 +30,7 @@
icon_state = "qmf"
item_color = "qmf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/cargotech
name = "cargo technician's jumpsuit"
@@ -38,14 +38,14 @@
icon_state = "cargotech"
item_state = "lb_suit"
item_color = "cargo"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargotech/skirt
name = "cargo technician's jumpskirt"
desc = "Skirrrrrts! They're comfy and easy to wear!"
icon_state = "cargof"
item_color = "cargof"
flags = null
flags_size = null
/obj/item/clothing/under/rank/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
@@ -53,14 +53,14 @@
icon_state = "chaplain"
item_state = "bl_suit"
item_color = "chapblack"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chef
desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
name = "chef's uniform"
icon_state = "chef"
item_color = "chef"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/clown
name = "clown suit"
@@ -68,7 +68,7 @@
icon_state = "clown"
item_state = "clown"
item_color = "clown"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/head_of_personnel
@@ -77,7 +77,7 @@
icon_state = "hop"
item_state = "b_suit"
item_color = "hop"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/head_of_personnel_whimsy
desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -94,7 +94,7 @@
item_state = "g_suit"
item_color = "hydroponics"
permeability_coefficient = 0.50
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/internalaffairs
desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
@@ -102,7 +102,7 @@
icon_state = "internalaffairs"
item_state = "internalaffairs"
item_color = "internalaffairs"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/ntrep
desc = "A well-ironed dress shirt and matching set of black pants."
@@ -110,7 +110,7 @@
icon_state = "internalaffairs"
item_state = "internalaffairs"
item_color = "internalaffairs"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
@@ -118,13 +118,13 @@
icon_state = "janitor"
item_color = "janitor"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/lawyer/black
icon_state = "lawyer_black"
@@ -173,7 +173,7 @@
icon_state = "red_suit"
item_state = "red_suit"
item_color = "red_suit"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/mime
name = "mime's outfit"
@@ -181,7 +181,7 @@
icon_state = "mime"
item_state = "mime"
item_color = "mime"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/miner
@@ -190,7 +190,7 @@
icon_state = "miner"
item_state = "miner"
item_color = "miner"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/barber
desc = "It's a barber's uniform."
code/modules/clothing/under/jobs/engineering.dm
+8 -8
View File
@@ -6,14 +6,14 @@
item_state = "g_suit"
item_color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chief_engineer/skirt
desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
name = "chief engineer's jumpskirt"
icon_state = "chieff"
item_color = "chieff"
flags = null
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/atmospheric_technician
@@ -22,14 +22,14 @@
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/atmospheric_technician/skirt
desc = "It's a jumpskirt worn by atmospheric technicians."
name = "atmospheric technician's jumpskirt"
icon_state = "atmosf"
item_color = "atmosf"
flags = null
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/engineer
@@ -39,7 +39,7 @@
item_state = "engi_suit"
item_color = "engine"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/engineer/skirt
@@ -47,7 +47,7 @@
name = "engineer's jumpskirt"
icon_state = "enginef"
item_color = "enginef"
flags = null
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/roboticist
@@ -56,14 +56,14 @@
icon_state = "robotics"
item_state = "robotics"
item_color = "robotics"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/roboticist/skirt
desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
name = "roboticist's jumpskirt"
icon_state = "roboticsf"
item_color = "roboticsf"
flags = null
flags_size = null
/obj/item/clothing/under/rank/mechanic
desc = "It's a pair of overalls worn by mechanics."
code/modules/clothing/under/jobs/medsci.dm
+27 -27
View File
@@ -8,7 +8,7 @@
item_state = "g_suit"
item_color = "director"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -18,14 +18,14 @@
item_color = "toxinswhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist/skirt
name = "scientist's jumpskirt"
icon_state = "sciencewhitef"
item_color = "sciencewhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/chemist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
@@ -35,14 +35,14 @@
item_color = "chemistrywhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chemist/skirt
name = "chemist's jumpskirt"
icon_state = "chemistrywhitef"
item_color = "chemistrywhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/*
* Medical
@@ -55,7 +55,7 @@
item_color = "cmo"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chief_medical_officer/skirt
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
@@ -63,7 +63,7 @@
icon_state = "cmof"
item_color = "cmof"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -73,14 +73,14 @@
item_color = "geneticswhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/geneticist/skirt
name = "geneticist's jumpskirt"
icon_state = "geneticswhitef"
item_color = "geneticswhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -90,14 +90,14 @@
item_color = "virologywhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/virologist/skirt
name = "virologist's jumpskirt"
icon_state = "virologywhitef"
item_color = "virologywhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/nursesuit
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -107,7 +107,7 @@
item_color = "nursesuit"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/nurse
desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -117,7 +117,7 @@
item_color = "nurse"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/orderly
desc = "A white suit to be worn by orderly people who love orderly things."
@@ -127,7 +127,7 @@
item_color = "orderly"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -137,42 +137,42 @@
item_color = "medical"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/skirt
name = "medical doctor's jumpskirt"
icon_state = "medicalf"
item_color = "medicalf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = null
flags_size = null
/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
icon_state = "scrubsblue"
item_color = "scrubsblue"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
icon_state = "scrubsgreen"
item_color = "scrubsgreen"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
icon_state = "scrubspurple"
item_color = "scrubspurple"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/mortician
name = "coroner's scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
icon_state = "scrubsblack"
item_color = "scrubsblack"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
//paramedic
/obj/item/clothing/under/rank/medical/paramedic
@@ -183,7 +183,7 @@
item_color = "paramedic"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
@@ -191,7 +191,7 @@
icon_state = "psych"
item_state = "w_suit"
item_color = "psych"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/psych/turtleneck
desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
@@ -199,7 +199,7 @@
icon_state = "psychturtle"
item_state = "b_suit"
item_color = "psychturtle"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/*
@@ -213,7 +213,7 @@
item_color = "genetics_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chemist_new
desc = "It's made of a special fiber which provides minor protection against biohazards."
@@ -223,7 +223,7 @@
item_color = "chemist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist_new
desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
@@ -233,7 +233,7 @@
item_color = "scientist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/virologist_new
desc = "Made of a special fiber that gives increased protection against biohazards."
@@ -243,4 +243,4 @@
item_color = "virologist_new"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
code/modules/clothing/under/jobs/security.dm
+12 -11
View File
@@ -16,7 +16,7 @@
item_state = "r_suit"
item_color = "warden"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
strip_delay = 50
/obj/item/clothing/under/rank/warden/skirt
@@ -25,7 +25,7 @@
icon_state = "wardenf"
item_state = "r_suit"
item_color = "wardenf"
flags = null
flags_size = null
/obj/item/clothing/under/rank/security
name = "security officer's jumpsuit"
@@ -34,7 +34,7 @@
item_state = "r_suit"
item_color = "secred"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
strip_delay = 50
/obj/item/clothing/under/rank/security/skirt
@@ -43,7 +43,7 @@
icon_state = "secredf"
item_state = "r_suit"
item_color = "secredf"
flags = null
flags_size = null
/obj/item/clothing/under/rank/dispatch
name = "dispatcher's uniform"
@@ -52,7 +52,7 @@
item_state = "dispatch"
item_color = "dispatch"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/security2
name = "security officer's uniform"
@@ -61,7 +61,8 @@
item_state = "r_suit"
item_color = "redshirt2"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/security/corp
icon_state = "sec_corporate"
item_state = "sec_corporate"
@@ -82,7 +83,7 @@
item_state = "det"
item_color = "detective"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
strip_delay = 50
species_fit = list("Vox")
sprite_sheets = list(
@@ -99,7 +100,7 @@
item_state = "r_suit"
item_color = "hosred"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
strip_delay = 60
/obj/item/clothing/under/rank/head_of_security/skirt
@@ -108,7 +109,7 @@
icon_state = "hosredf"
item_state = "r_suit"
item_color = "hosredf"
flags = null
flags_size = null
/obj/item/clothing/under/rank/head_of_security/corp
icon_state = "hos_corporate"
@@ -122,7 +123,7 @@
icon_state = "jensen"
item_state = "jensen"
item_color = "jensen"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
//Paradise Station
@@ -179,4 +180,4 @@
item_color = "brig_phys"
permeability_coefficient = 0.50
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
code/modules/clothing/under/miscellaneous.dm
+4 -4
View File
@@ -88,7 +88,7 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/captain
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."
@@ -105,7 +105,7 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/representative
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shounder."
@@ -114,7 +114,7 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/diplomatic
desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps."
@@ -231,7 +231,7 @@
icon_state = "red_suit"
item_state = "r_suit"
item_color = "red_suit"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
code/modules/clothing/under/pants.dm
+1 -1
View File
@@ -86,4 +86,4 @@
desc = "For those brave enough to weather the breeze."
icon_state = "chaps"
item_color = "chaps"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
code/modules/customitems/item_defines.dm
+1 -1
View File
@@ -418,7 +418,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_robe"
item_state = "chronx_robe"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
action_button_name = "Transform Robes"
adjust_flavour = "untransform"
ignore_suitadjust = 0
code/modules/mob/living/carbon/brain/posibrain.dm
+4 -3
View File
@@ -144,11 +144,12 @@
/obj/item/device/mmi/posibrain/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
if(!..(user))
to_chat(user, "<span class='info'>*---------*</span>")
return
var/msg = "<span class='info'>*---------*\nThis is [bicon(src)] \a <EM>[src]</EM>!\n[desc]\n"
msg += "<span class='warning'>"
var/msg = "<span class='info'>"
if(src.brainmob && src.brainmob.key)
switch(src.brainmob.stat)
@@ -158,7 +159,7 @@
if(DEAD) msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
else
msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
msg += "<span class='info'>*---------*</span>"
msg += "*---------*</span>"
to_chat(user, msg)
/obj/item/device/mmi/posibrain/emp_act(severity)
code/modules/mob/living/carbon/human/death.dm
+1 -1
View File
@@ -111,7 +111,7 @@
if(istype(I,/mob/living/simple_animal/borer))
B = I
if(B)
if(!B.ckey && ckey && B.controlling)
if(B.controlling && B.host == src)
B.detatch()
verbs -= /mob/living/carbon/proc/release_control
code/modules/mob/living/carbon/human/inventory.dm
+1 -1
View File
@@ -423,7 +423,7 @@
if(istype(I, /obj/item/clothing/under) || istype(I, /obj/item/clothing/suit))
if(FAT in mutations)
//testing("[M] TOO FAT TO WEAR [src]!")
if(!(I.flags & ONESIZEFITSALL))
if(!(I.flags_size & ONESIZEFITSALL))
if(!disable_warning)
to_chat(src, "<span class='alert'>You're too fat to wear the [I].</span>")
return 0
code/modules/mob/living/carbon/human/species/golem.dm
+2 -1
View File
@@ -75,7 +75,8 @@
item_state = "golem"
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES
flags = ONESIZEFITSALL | ABSTRACT | NODROP | THICKMATERIAL
flags = ABSTRACT | NODROP | THICKMATERIAL
flags_size = ONESIZEFITSALL
armor = list(melee = 55, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/shoes/golem
code/modules/mob/living/carbon/human/update_icons.dm
+2 -2
View File
@@ -600,7 +600,7 @@ var/global/list/damage_icon_parts = list()
var/image/standing = image("icon_state" = "[t_color]_s")
if(FAT in mutations)
if(w_uniform.flags&ONESIZEFITSALL)
if(w_uniform.flags_size & ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
to_chat(src, "\red You burst out of \the [w_uniform]!")
@@ -911,7 +911,7 @@ var/global/list/damage_icon_parts = list()
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
else if(FAT in mutations)
if(wear_suit.flags&ONESIZEFITSALL)
if(wear_suit.flags_size & ONESIZEFITSALL)
standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
else
to_chat(src, "\red You burst out of \the [wear_suit]!")
code/modules/mob/living/carbon/slime/examine.dm
+2 -1
View File
@@ -1,6 +1,7 @@
/mob/living/carbon/slime/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
if (src.stat == DEAD)
msg += "<span class='deadsay'>It is limp and unresponsive.</span>\n"
else
code/modules/mob/living/say.dm
+2 -1
View File
@@ -28,7 +28,8 @@ var/list/department_radio_keys = list(
":T" = "Syndicate", "#T" = "Syndicate", ".T" = "Syndicate",
":U" = "Supply", "#U" = "Supply", ".U" = "Supply",
":Z" = "Service", "#Z" = "Service", ".Z" = "Service",
":P" = "AI Private", "#P" = "AI Private", ".P" = "AI Private"
":P" = "AI Private", "#P" = "AI Private", ".P" = "AI Private",
":-" = "Special Ops", "#-" = "Special Ops", ".-" = "Special Ops"
)
code/modules/mob/living/silicon/ai/examine.dm
+3 -1
View File
@@ -1,8 +1,10 @@
/mob/living/silicon/ai/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
if(!..(user))
to_chat(user, "<span class='info'>*---------*</span>")
return
var/msg = ""
var/msg = "<span class='info'>"
if (src.stat == DEAD)
msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
else
code/modules/mob/living/silicon/pai/examine.dm
-25
View File
@@ -1,25 +0,0 @@
/mob/living/silicon/pai/examine(mob/user) //removed as it was pointless...moved to the pai-card instead.
/*..(user) //This is totally pointless because this mob is contained inside a card!
var/msg = ""
if (src.stat == DEAD)
msg += "<span class='deadsay'>It appears to be offline.</span>\n"
else
msg += "<span class='warning'>"
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
msg += "It looks slightly dented.\n"
else
msg += "<B>Its casing appears cracked and broken!</B>\n"
if (src.getFireLoss())
if (src.getFireLoss() < 30)
msg += "It looks slightly charred!\n"
else
msg += "<B>Its casing is melted and heat-warped!</B>\n"
if (src.stat == UNCONSCIOUS)
msg += "It doesn't seem to be responding and its text-output is lagging.\n"
msg += "</span>"
msg += "*---------*</span>"
to_chat(user, msg)
*/
code/modules/mob/living/silicon/pai/pai.dm
+4 -3
View File
@@ -521,23 +521,24 @@
density = 0 //this is reset every canmove update otherwise
/mob/living/silicon/pai/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
switch(src.stat)
if(CONSCIOUS)
if(!src.client) msg += "\nIt appears to be in stand-by mode." //afk
if(UNCONSCIOUS) msg += "\n<span class='warning'>It doesn't seem to be responding.</span>"
if(DEAD) msg += "\n<span class='deadsay'>It looks completely unsalvageable.</span>"
msg += "\n*---------*</span>"
if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
if(print_flavor_text()) msg += "\n[print_flavor_text()]"
if (pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\nIt is [pose]"
msg += "\n*---------*</span>"
to_chat(user, msg)
code/modules/mob/living/silicon/robot/examine.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/mob/living/silicon/robot/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
var/obj/act_module = get_active_hand()
if(act_module)
msg += "It is holding [bicon(act_module)] \a [act_module].\n"
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -1
View File
@@ -230,7 +230,7 @@
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/soap/nanotrasen(src)
src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src)
src.modules += new /obj/item/weapon/mop(src)
src.modules += new /obj/item/weapon/mop/advanced/cyborg(src)
src.modules += new /obj/item/device/lightreplacer(src)
src.modules += new /obj/item/weapon/holosign_creator(src)
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
code/modules/mob/living/simple_animal/constructs.dm
+2 -1
View File
@@ -40,9 +40,10 @@
return
/mob/living/simple_animal/construct/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
if (src.health < src.maxHealth)
msg += "<span class='warning'>"
if (src.health >= src.maxHealth/2)
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+3 -1
View File
@@ -194,7 +194,9 @@
if(.)
amount_grown += rand(1,2)
if(amount_grown >= 100)
new /mob/living/simple_animal/chicken(src.loc)
var/mob/living/simple_animal/chicken/C = new /mob/living/simple_animal/chicken(loc)
if(mind)
mind.transfer_to(C)
qdel(src)
var/const/MAX_CHICKENS = 50
code/modules/mob/living/simple_animal/simple_animal.dm
-1
View File
@@ -446,7 +446,6 @@
else
visible_message("<span class='danger'>[O] bounces harmlessly off of [src].</span>",\
"<span class='userdanger'>[O] bounces harmlessly off of [src].</span>")
playsound(loc, O.hitsound, 50, 1, -1)
else
user.visible_message("<span class='warning'>[user] gently taps [src] with [O].</span>",\
"<span class='warning'>This weapon is ineffective, it does no damage.</span>")
code/modules/mob/mob.dm
+1 -1
View File
@@ -402,7 +402,7 @@ var/list/slot_equipment_priority = list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
if((FAT in H.mutations) && !(flags_size & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))
code/modules/projectiles/guns/projectile/automatic.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/obj/item/weapon/gun/projectile/automatic/ui_action_click()
burst_select()
/obj/item/weapon/gun/projectile/automatic/verb/burst_select()
/obj/item/weapon/gun/projectile/automatic/proc/burst_select()
var/mob/living/carbon/human/user = usr
select = !select
if(!select)
code/modules/reagents/newchem/pyro.dm
+2
View File
@@ -535,6 +535,7 @@ datum/reagent/pyrosium/on_tick()
required_reagents = list("chlorine" = 1, "oxygen" = 1, "nitrogen" = 1, "ammonia" = 1, "sodium" = 1, "silver" = 1)
result_amount = 1
mix_message = "The substance violently detonates!"
mix_sound = 'sound/effects/bang.ogg'
/datum/chemical_reaction/azide/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -603,6 +604,7 @@ datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume)
required_reagents = list("firefighting_foam" = 1, "clf3" = 1)
result_amount = 1
mix_message = "The substance violently detonates!"
mix_sound = 'sound/effects/bang.ogg'
/datum/chemical_reaction/clf3_firefighting/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
code/modules/research/rdconsole.dm
+21 -21
View File
@@ -46,11 +46,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/obj/machinery/r_n_d/circuit_imprinter/linked_imprinter = null //Linked Circuit Imprinter
var/screen = 1.0 //Which screen is currently showing.
var/menu = 0 // Current menu.
var/submenu = 0
var/wait_message = 0
var/id = 0 //ID of the computer (for server restrictions).
var/sync = 1 //If sync = 0, it doesn't show up on Server Control Console
@@ -221,7 +221,7 @@ proc/CallMaterialName(ID)
if(href_list["category"] in D.category)
matching_designs.Add(D)
submenu = 1
selected_category = "Viewing Category [href_list["category"]]"
else if(href_list["updt_tech"]) //Update the research holder with information from the technology disk.
@@ -466,9 +466,9 @@ proc/CallMaterialName(ID)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
var/O = being_built.locked
coeff *= being_built.lathe_time_factor
spawn(32*amount/coeff)
if(g2g) //And if we only fail the material requirements, we still spend time and power
for(var/i = 0, i<amount, i++)
@@ -645,7 +645,7 @@ proc/CallMaterialName(ID)
if(findtext(D.name,href_list["to_search"]))
matching_designs.Add(D)
submenu = 1
selected_category = "Search Results for '[href_list["to_search"]]'"
nanomanager.update_uis(src)
@@ -663,14 +663,14 @@ proc/CallMaterialName(ID)
/obj/machinery/computer/rdconsole/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1)
user.set_machine(src)
var/data = list()
files.RefreshResearch()
data["menu"] = menu
data["submenu"] = submenu
data["wait_message"] = wait_message
data["src_ref"] = "\ref[src]"
data["linked_destroy"] = linked_destroy ? 1 : 0
data["linked_lathe"] = linked_lathe ? 1 : 0
data["linked_imprinter"] = linked_imprinter ? 1 : 0
@@ -678,8 +678,8 @@ proc/CallMaterialName(ID)
data["admin"] = check_rights(R_ADMIN,0)
data["disk_type"] = d_disk ? 2 : (t_disk ? 1 : 0)
data["category"] = selected_category
if(menu == 1)
if(menu == 0 || menu == 1)
var/list/tech_levels = list()
data["tech_levels"] = tech_levels
for(var/datum/tech/T in files.known_tech)
@@ -690,16 +690,16 @@ proc/CallMaterialName(ID)
this_tech_list["level"] = T.level
this_tech_list["desc"] = T.desc
tech_levels[++tech_levels.len] = this_tech_list
if(menu == 2)
if(t_disk != null && t_disk.stored != null && submenu == 0) //Technology Disk Menu
var/list/disk_data = list()
data["disk_data"] = disk_data
disk_data["name"] = t_disk.stored.name
disk_data["level"] = t_disk.stored.level
disk_data["desc"] = t_disk.stored.desc
if(t_disk != null && submenu == 1)
var/list/to_copy = list()
data["to_copy"] = to_copy
@@ -710,7 +710,7 @@ proc/CallMaterialName(ID)
continue
item["name"] = T.name
item["id"] = T.id
if(d_disk != null && d_disk.blueprint != null && submenu == 0)
var/list/disk_data = list()
data["disk_data"] = disk_data
@@ -732,7 +732,7 @@ proc/CallMaterialName(ID)
materials[++materials.len] = material
material["name"] = CallMaterialName(M)
material["amount"] = d_disk.blueprint.materials[M]
if(d_disk != null && submenu == 1)
var/list/to_copy = list()
data["to_copy"] = to_copy
@@ -759,7 +759,7 @@ proc/CallMaterialName(ID)
if(F.name == CallTechName(T))
tech_item["current_level"] = F.level
break
if(menu == 4 && linked_lathe)
data["total_materials"] = linked_lathe.materials.total_amount
data["max_materials"] = linked_lathe.materials.max_amount
@@ -783,7 +783,7 @@ proc/CallMaterialName(ID)
material_list["name"] = CallMaterialName(M)
material_list["amount"] = D.materials[M]
var/t = linked_lathe.check_mat(D, M)
if(t < 1)
material_list["is_red"] = 1
else
@@ -796,7 +796,7 @@ proc/CallMaterialName(ID)
material_list["name"] = CallMaterialName(R)
material_list["amount"] = D.reagents[R]
var/t = linked_lathe.check_mat(D, R)
if(t < 1)
material_list["is_red"] = 1
else
@@ -824,7 +824,7 @@ proc/CallMaterialName(ID)
loaded_chemical["name"] = R.name
loaded_chemical["volume"] = R.volume
loaded_chemical["id"] = R.id
if(menu == 5 && linked_imprinter)
data["total_materials"] = linked_imprinter.TotalMaterials()
data["total_chemicals"] = linked_imprinter.reagents.total_volume
@@ -867,7 +867,7 @@ proc/CallMaterialName(ID)
loaded_chemical["name"] = R.name
loaded_chemical["volume"] = R.volume
loaded_chemical["id"] = R.id
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "r_n_d.tmpl", src.name, 800, 550)