| [C] | " + dat += "[C] | " line_length++ dat += "
- ╝
- ╚
+ ╝
+ ╚
- ╗
- ╔
+ ╗
+ ╔
- ╦
- ╣
+ ╦
+ ╣
- ╩
- ╠
+ ╩
+ ╠
- ╦
- ╣
+ ╦
+ ╣
- ╩
- ╠
+ ╩
+ ╠
- ╦
- ╣
+ ╦
+ ╣
- ╩
- ╠
+ ╩
+ ╠
- ↑ - → - ↓ - ← + ↑ + → + ↓ + ←
"} if(PIPE_QUAD) // Single icon_state (eg 4-way manifolds) @@ -354,7 +355,7 @@ var/global/list/RPD_recipes=list( else dirsel+={" "} @@ -409,6 +410,7 @@ var/global/list/RPD_recipes=list( src.add_fingerprint(usr) if(href_list["setdir"]) p_dir= text2num(href_list["setdir"]) + p_flipped = text2num(href_list["flipped"]) show_menu(usr) if(href_list["eatpipes"]) @@ -509,6 +511,7 @@ var/global/list/RPD_recipes=list( if(do_after(user, 20)) activate() var/obj/item/pipe/P = new (A, pipe_type=p_type, dir=p_dir) + P.flipped = p_flipped P.update() P.add_fingerprint(usr) return 1 diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index ac865a96dc5..463e260c395 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -1,10 +1,10 @@ -#define EMPTY 0 -#define WIRED 1 -#define READY 2 +#define EMPTY 1 +#define WIRED 2 +#define READY 3 /obj/item/weapon/grenade/chem_grenade name = "grenade" - desc = "A do it yourself grenade casing!" + desc = "A custom made grenade." icon_state = "chemg" item_state = "flashbang" w_class = 2 @@ -18,7 +18,7 @@ /obj/item/weapon/grenade/chem_grenade/New() create_reagents(1000) - name = "[initial(name)] casing" // By adding the " casing" part here we can use initial(name) to get the final name, making it nice to say "large grenade" when it is a large grenade. + stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY. /obj/item/weapon/grenade/chem_grenade/examine(mob/user) @@ -121,18 +121,19 @@ /obj/item/weapon/grenade/chem_grenade/proc/stage_change(var/N) - stage = N - if (stage == EMPTY) + if(N) + stage = N + if(stage == EMPTY) name = "[initial(name)] casing" - desc = initial(desc) + desc = "A do it yourself [initial(name)] casing!" icon_state = initial(icon_state) - else if (stage == WIRED) + else if(stage == WIRED) name = "unsecured [initial(name)]" desc = "An unsecured [initial(name)] assembly." icon_state = "[initial(icon_state)]_ass" - else if (stage == READY) + else if(stage == READY) name = initial(name) - desc = "A custom made [initial(name)]." + desc = initial(desc) icon_state = "[initial(icon_state)]_locked" @@ -225,7 +226,7 @@ //Large chem grenades accept slime cores and use the appropriately. /obj/item/weapon/grenade/chem_grenade/large name = "large grenade" - desc = "An oversized grenade casing." + desc = "A custom made large grenade." icon_state = "large_grenade" allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment, /obj/item/weapon/reagent_containers/food/drinks) @@ -275,7 +276,6 @@ beakers += B1 beakers += B2 - icon_state = "grenade" /obj/item/weapon/grenade/chem_grenade/incendiary @@ -294,7 +294,6 @@ beakers += B1 beakers += B2 - icon_state = "grenade" /obj/item/weapon/grenade/chem_grenade/antiweed @@ -314,7 +313,6 @@ beakers += B1 beakers += B2 - icon_state = "grenade" /obj/item/weapon/grenade/chem_grenade/cleaner @@ -333,7 +331,6 @@ beakers += B1 beakers += B2 - icon_state = "grenade" /obj/item/weapon/grenade/chem_grenade/teargas @@ -353,7 +350,6 @@ beakers += B1 beakers += B2 - icon_state = "grenade" /obj/item/weapon/grenade/chem_grenade/facid @@ -366,14 +362,13 @@ var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("facid", 100) + B1.reagents.add_reagent("facid", 25) B1.reagents.add_reagent("potassium", 25) B2.reagents.add_reagent("phosphorus", 25) B2.reagents.add_reagent("sugar", 25) beakers += B1 beakers += B2 - icon_state = "grenade" #undef EMPTY #undef WIRED diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 5ac93427b86..c3ac412ca4e 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -189,14 +189,15 @@ /obj/item/weapon/storage/belt/holster name = "shoulder holster" - desc = "A holster to conceal a carried handgun. WARNING: Badasses only." + desc = "A holster to conceal a carried handgun and ammo. WARNING: Badasses only." icon_state = "holster" item_state = "holster" - storage_slots = 1 - max_w_class = 4 + storage_slots = 3 + max_w_class = 3 can_hold = list( /obj/item/weapon/gun/projectile/automatic/pistol, - /obj/item/weapon/gun/projectile/revolver/detective + /obj/item/weapon/gun/projectile/revolver, + /obj/item/ammo_box, ) /obj/item/weapon/storage/belt/fannypack diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index b41d9ad3562..a5fb164b08b 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -168,9 +168,9 @@ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") /obj/item/weapon/storage/secure/briefcase/New() - ..() new /obj/item/weapon/paper(src) new /obj/item/weapon/pen(src) + return ..() /obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) @@ -194,9 +194,10 @@ force = 15.0 /obj/item/weapon/storage/secure/briefcase/syndie/New() - ..() - for(var/i = 0, i < 5, i++) + for(var/i = 0, i < storage_slots - 2, i++) new /obj/item/weapon/spacecash/c1000(src) + return ..() + // ----------------------------- // Secure Safe diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 54ed6539c1b..10ba58741b0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -126,10 +126,10 @@ return src.close() return src.open() -// this should probably use dump_contents() /obj/structure/closet/ex_act(severity, target) contents_explosion(severity, target) - open() + dump_contents() + qdel(src) ..() /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index c40411364be..30fc7329d5b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -48,7 +48,7 @@ new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/weapon/storage/box/ids(src) new /obj/item/weapon/storage/box/ids(src) - new /obj/item/clothing/suit/armor/vest/alt(src) + new /obj/item/clothing/suit/armor/vest(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/device/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) @@ -75,8 +75,9 @@ new /obj/item/clothing/under/hosparadefem(src) new /obj/item/clothing/under/hosparademale(src) new /obj/item/clothing/suit/armor/hos(src) + new /obj/item/clothing/under/rank/head_of_security/alt(src) new /obj/item/clothing/head/HoS(src) - new /obj/item/clothing/glasses/hud/security/eyepatch(src) + new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/clothing/mask/gas/sechailer/swat(src) @@ -103,8 +104,9 @@ new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/clothing/suit/armor/vest/warden/(src) new /obj/item/clothing/head/warden(src) - new /obj/item/clothing/suit/armor/vest/warden/alt(src) new /obj/item/clothing/head/beret/sec/navywarden(src) + new /obj/item/clothing/suit/armor/vest/warden/alt(src) + new /obj/item/clothing/under/rank/warden/navyblue(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/weapon/storage/box/flashbangs(src) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index dcaab15c107..f54b3534b41 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -114,7 +114,9 @@ var/list/admin_verbs_debug = list( /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/callproc, - /client/proc/SDQL2_query + /client/proc/SDQL2_query, + /client/proc/test_movable_UI, + /client/proc/test_snap_UI ) var/list/admin_verbs_possess = list( /proc/possess, diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 46ace545763..422b26ec36d 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -465,20 +465,21 @@ client/proc/one_click_antag() //Spawn and equip the officer var/mob/living/carbon/human/ERTOperative = new(spawnloc) + var/list/lastname = last_names chosen_candidate.client.prefs.copy_to(ERTOperative) ready_dna(ERTOperative) switch(numagents) if(1) - ERTOperative.real_name = "Commander [pick(ERTOperative.real_name)]" + ERTOperative.real_name = "Commander [pick(lastname)]" equip_emergencyresponsesquad(ERTOperative, "commander") if(2 || 5) - ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]" + ERTOperative.real_name = "Security Officer [pick(lastname)]" equip_emergencyresponsesquad(ERTOperative, "sec") if(3 || 6) - ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]" + ERTOperative.real_name = "Medical Officer [pick(lastname)]" equip_emergencyresponsesquad(ERTOperative, "med") if(4 || 7) - ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]" + ERTOperative.real_name = "Engineer [pick(lastname)]" equip_emergencyresponsesquad(ERTOperative, "eng") ERTOperative.key = chosen_candidate.key ERTOperative.mind.assigned_role = "ERT" @@ -493,7 +494,7 @@ client/proc/one_click_antag() ERTOperative.mind.objectives += missionobj //Greet the commando - ERTOperative << "You are the [numagents==1?"Emergency Response Team Commander":"Emergency Response Officer"]." + ERTOperative << "You are [numagents==1?"the Emergency Response Team Commander":"an Emergency Response Officer"]." var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division." if(numagents == 1) //If Squad Leader missiondesc += " Lead your squad to ensure the completion of the mission. Avoid civilian casualites when possible. Board the shuttle when your team is ready." @@ -505,7 +506,7 @@ client/proc/one_click_antag() //Logging and cleanup if(numagents == 1) message_admins("The emergency response team has spawned with the mission: [mission].") - log_game("[key_name(ERTOperative)] has been selected as a Emergency Response Officer") + log_game("[key_name(ERTOperative)] has been selected as an Emergency Response Officer") spawnpoints -= spawnloc numagents-- diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 7e33cebffd0..3f35026c7be 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -150,7 +150,7 @@ prefs.save_preferences() src << "Others can[(prefs.toggles & MEMBER_PUBLIC) ? "" : "not"] see whether you are a byond member." -var/list/ghost_forms = list("ghost","ghostking","ghostian2","ghost_red","ghost_black", \ +var/list/ghost_forms = list("ghost","ghostking","ghostian2","skeleghost","ghost_red","ghost_black", \ "ghost_blue","ghost_yellow","ghost_green","ghost_pink", \ "ghost_cyan","ghost_dblue","ghost_dred","ghost_dgreen", \ "ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink") diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 1935d89d50f..012a260bba5 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -40,7 +40,7 @@ icon_state = "securityhud" hud_type = DATA_HUD_SECURITY_ADVANCED -/obj/item/clothing/glasses/hud/security/eyepatch +/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch name = "Eyepatch HUD" desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball." icon_state = "hudpatch" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c7d5bcdbfb1..d1b15282247 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -13,7 +13,8 @@ strip_delay = 60 /obj/item/clothing/head/helmet/alt - desc = "A bulletproof helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." + name = "bulletproof helmet" + desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." icon_state = "helmetalt" item_state = "helmetalt" armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 99caa01812d..ff4daf648d0 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -16,14 +16,6 @@ blood_overlay_type = "armor" armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) -/obj/item/clothing/suit/armor/vest/alt - name = "armor" - desc = "An armored vest that protects against most types of damage. This is a civilian variant." - icon_state = "armoralt" - item_state = "armoralt" - blood_overlay_type = "armor" - armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) - /obj/item/clothing/suit/armor/hos name = "armored greatcoat" desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence." diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index bb6be40c422..2730806844c 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -10,19 +10,19 @@ */ /obj/item/clothing/under/rank/security - name = "security suit" - desc = "A formal security suit for officers complete with nanotrasen belt buckle." + name = "security jumpsuit" + desc = "A tactical security jumpsuit for officers complete with nanotrasen belt buckle." icon_state = "security" - item_state = "gy_suit" + item_state = "r_suit" item_color = "security" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 /obj/item/clothing/under/rank/warden - name = "warden's suit" - desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders." + name = "warden's jumpsuit" + desc = "A tactical security jumpsuit for the warden with silver desginations and '/Warden/' stiched into the shoulders." icon_state = "warden" - item_state = "gy_suit" + item_state = "r_suit" item_color = "warden" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 @@ -50,20 +50,27 @@ * Head of Security */ /obj/item/clothing/under/rank/head_of_security - name = "head of security's suit" - desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security." + name = "head of security's jumpsuit" + desc = "A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security." icon_state = "hos" - item_state = "gy_suit" + item_state = "r_suit" item_color = "hos" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 60 +/obj/item/clothing/under/rank/head_of_security/alt + name = "head of security's turtleneck" + desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants." + icon_state = "hosalt" + item_state = "bl_suit" + item_color = "hosalt" + /* * Navy uniforms */ /obj/item/clothing/under/rank/security/navyblue - name = "security officer's uniform" + name = "security officer's formal uniform" desc = "The latest in fashionable security outfits." icon_state = "officerblueclothes" item_state = "officerblueclothes" @@ -71,14 +78,14 @@ /obj/item/clothing/under/rank/head_of_security/navyblue desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." - name = "head of security's uniform" + name = "head of security's formal uniform" icon_state = "hosblueclothes" item_state = "hosblueclothes" item_color = "hosblueclothes" /obj/item/clothing/under/rank/warden/navyblue desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." - name = "warden's uniform" + name = "warden's formal uniform" icon_state = "wardenblueclothes" item_state = "wardenblueclothes" item_color = "wardenblueclothes" \ No newline at end of file diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 3849d5aa4d8..be8a6731542 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -161,6 +161,7 @@ dat += "Medical belt: Make ([300/efficiency])