diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ebf00444022..30122e4d4b7 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -20,6 +20,7 @@ var/heat_proof = 0 // For glass airlocks/opacity firedoors var/emergency = 0 var/air_properties_vary_with_direction = 0 + var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened. //Multi-tile doors dir = EAST @@ -96,7 +97,7 @@ /obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 + if(air_group) return !block_air_zones if(istype(mover) && mover.checkpass(PASSGLASS)) return !opacity return !density diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e0c1cc4588a..968f5b8575e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -60,6 +60,10 @@ opacity = 0 density = 0 + //These are frequenly used with windows, so make sure zones can pass. + //Generally if a firedoor is at a place where there should be a zone boundery then there will be a regular door underneath it. + block_air_zones = 0 + var/blocked = 0 var/lockdown = 0 // When the door has detected a problem, it locks. var/pdiff_alert = 0 @@ -106,7 +110,7 @@ /obj/machinery/door/firedoor/examine() set src in view() . = ..() - + if(pdiff >= FIREDOOR_MAX_PRESSURE_DIFF) usr << "WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!" @@ -287,7 +291,7 @@ /obj/machinery/door/firedoor/attack_ai(mob/user as mob) if(operating) - return //Already doing something. + return //Already doing something. if(blocked) user << "\red \The [src] is welded solid!" @@ -295,11 +299,11 @@ var/area/A = get_area_master(src) ASSERT(istype(A)) // This worries me. - var/alarmed = A.air_doors_activated || A.fire + var/alarmed = A.air_doors_activated || A.fire var/access_granted = 0 if(isAI(user) || isrobot(user)) - access_granted = 1 + access_granted = 1 if(access_granted == 1) user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\ @@ -320,7 +324,7 @@ spawn(50) if(alarmed) nextstate = CLOSED - + // CHECK PRESSURE /obj/machinery/door/firedoor/process() ..() diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index e4924825b13..3d6ce2459ec 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -13,6 +13,16 @@ max_amount = 60 attack_verb = list("hit", "bludgeoned", "whacked") +/obj/item/stack/rods/New(var/loc, var/amount=null) + update_icon() + return ..() + +/obj/item/stack/rods/update_icon() + if(get_amount() <= 5) + icon_state = "rods-[get_amount()]" + else + icon_state = "rods" + /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params) ..() if (istype(W, /obj/item/weapon/weldingtool)) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 45b483d602d..15aa4938875 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -169,6 +169,7 @@ if(usr) usr.unEquip(src, 1) qdel(src) + update_icon() return 1 /obj/item/stack/proc/add_to_stacks(mob/usr as mob) @@ -185,6 +186,7 @@ usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." if(!oldsrc) break + update_icon() /obj/item/stack/proc/get_amount() return amount @@ -201,6 +203,7 @@ spawn(0) src.interact(usr) else ..() + update_icon() return /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params) @@ -220,6 +223,7 @@ src.use(to_transfer) if (src && usr.machine==src) spawn(0) src.interact(usr) + S.update_icon() else return ..() /obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 035b2d23096..ecc2a812bf0 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -119,6 +119,10 @@ var/savefile/Banlist Banlist["temp"] << temp if (temp) Banlist["minutes"] << bantimestamp + if(!temp) + notes_add(ckey, "Permanently banned - [reason]") + else + notes_add(ckey, "Banned for [minutes] minutes - [reason]") return 1 /proc/RemoveBan(foldername) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index c8a94029e1a..e0741ed1ac7 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -343,4 +343,10 @@ icon_state = "griffinhat" item_state = "griffinhat" flags = BLOCKHAIR|NODROP - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE \ No newline at end of file + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + +/obj/item/clothing/head/lordadmiralhat + name = "Lord Admiral's Hat" + desc = "A hat suitable for any man of high and exalted rank." + icon_state = "lordadmiralhat" + item_state = "lordadmiralhat" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 3b85dd5299b..d367671e34f 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -256,54 +256,3 @@ "Vox" = 'icons/mob/species/vox/head.dmi', "Vox Armalis" = 'icons/mob/species/armalis/head.dmi', ) - -/obj/item/clothing/suit/space/plasmaman - w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box/magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank) - slowdown = 2 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0) - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE - species_restricted = list("Plasmaman") - flags = STOPSPRESSUREDMAGE | PLASMAGUARD - - icon_state = "plasmaman_suit" - item_state = "plasmaman_suit" - -/obj/item/clothing/head/helmet/space/plasmaman - flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD - species_restricted = list("Plasmaman") - - icon_state = "plasmaman_helmet0" - item_state = "plasmaman_helmet0" - var/brightness_on = 4 //luminosity when on - var/on = 0 - var/no_light=0 // Disable the light on the atmos suit - action_button_name = "Toggle Helmet Light" - - attack_self(mob/user) - if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. - return - if(no_light) - return - on = !on - icon_state = "plasmaman_helmet[on]" -// item_state = "rig[on]-[_color]" - - if(on) user.SetLuminosity(user.luminosity + brightness_on) - else user.SetLuminosity(user.luminosity - brightness_on) - - pickup(mob/user) - if(on) - user.SetLuminosity(user.luminosity + brightness_on) -// user.UpdateLuminosity() - SetLuminosity(0) - - dropped(mob/user) - if(on) - user.SetLuminosity(user.luminosity - brightness_on) -// user.UpdateLuminosity() - SetLuminosity(brightness_on) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm new file mode 100644 index 00000000000..6c20fbae7ee --- /dev/null +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -0,0 +1,170 @@ +// PLASMEN SHIT +// CAN'T WEAR UNLESS YOU'RE A PINK SKELLINGTON +/obj/item/clothing/suit/space/eva/plasmaman + w_class = 3 + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank) + slowdown = 2 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0) + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + species_restricted = list("Plasmaman") + flags = STOPSPRESSUREDMAGE | PLASMAGUARD + + icon_state = "plasmaman_suit" + item_state = "plasmaman_suit" + + var/next_extinguish=0 + var/extinguish_cooldown=10 SECONDS + var/extinguishes_left=10 // Yeah yeah, reagents, blah blah blah. This should be simple. + +/obj/item/clothing/suit/space/eva/plasmaman/examine() + set src in view() + ..() + usr << "There are [extinguishes_left] extinguisher canisters left in this suit." +/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/user) + var/mob/living/carbon/human/H=user + if(extinguishes_left) + if(next_extinguish > world.time) + return + + next_extinguish = world.time + extinguish_cooldown + extinguishes_left-- + H << "Your suit automatically extinguishes the fire." + H.ExtinguishMob() + +/obj/item/clothing/head/helmet/space/eva/plasmaman + flags = HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD + species_restricted = list("Plasmaman") + + icon_state = "plasmaman_helmet0" + item_state = "plasmaman_helmet0" + var/base_state = "plasmaman_helmet" + var/brightness_on = 4 //luminosity when on + var/on = 0 + var/no_light=0 // Disable the light on the atmos suit + action_button_name = "Toggle Helmet Light" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/attack_self(mob/user) + if(!isturf(user.loc)) + user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + return + if(no_light) + return + on = !on + icon_state = "[base_state][on]" +// item_state = "rig[on]-[_color]" + if(on) user.SetLuminosity(user.luminosity + brightness_on) + else user.SetLuminosity(user.luminosity - brightness_on) + +/obj/item/clothing/head/helmet/space/eva/plasmaman/pickup(mob/user) + if(on) + user.SetLuminosity(user.luminosity + brightness_on) +// user.UpdateLuminosity() + SetLuminosity(0) + +/obj/item/clothing/head/helmet/space/eva/plasmaman/dropped(mob/user) + if(on) + user.SetLuminosity(user.luminosity - brightness_on) +// user.UpdateLuminosity() + SetLuminosity(brightness_on) + + + +// ENGINEERING +/obj/item/clothing/suit/space/eva/plasmaman/assistant + icon_state = "plasmamanAssistant_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant + icon_state = "plasmamanAssistant_helmet0" + base_state = "plasmamanAssistant_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/atmostech + icon_state = "plasmamanAtmos_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech + icon_state = "plasmamanAtmos_helmet0" + base_state = "plasmamanAtmos_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/engineer + icon_state = "plasmamanEngineer_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer + icon_state = "plasmamanEngineer_helmet0" + base_state = "plasmamanEngineer_helmet" + + +//SERVICE + +/obj/item/clothing/suit/space/eva/plasmaman/botanist + icon_state = "plasmamanBotanist_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/botanist + icon_state = "plasmamanBotanist_helmet0" + base_state = "plasmamanBotanist_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/chaplain + icon_state = "plasmamanChaplain_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain + icon_state = "plasmamanChaplain_helmet0" + base_state = "plasmamanChaplain_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/service + icon_state = "plasmamanService_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/service + icon_state = "plasmamanService_helmet0" + base_state = "plasmamanService_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/janitor + icon_state = "plasmamanJanitor_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor + icon_state = "plasmamanJanitor_helmet0" + base_state = "plasmamanJanitor_helmet" + + +//CARGO + +/obj/item/clothing/suit/space/eva/plasmaman/cargo + icon_state = "plasmamanCargo_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/cargo + icon_state = "plasmamanCargo_helmet0" + base_state = "plasmamanCargo_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/miner + icon_state = "plasmamanMiner_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/miner + icon_state = "plasmamanMiner_helmet0" + base_state = "plasmamanMiner_helmet" + + +// MEDSCI + +/obj/item/clothing/suit/space/eva/plasmaman/medical + icon_state = "plasmamanMedical_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/medical + icon_state = "plasmamanMedical_helmet0" + base_state = "plasmamanMedical_helmet" + +/obj/item/clothing/suit/space/eva/plasmaman/science + icon_state = "plasmamanScience_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/science + icon_state = "plasmamanScience_helmet0" + base_state = "plasmamanScience_helmet" + + +//SECURITY + +/obj/item/clothing/suit/space/eva/plasmaman/security + icon_state = "plasmamanSecurity_suit" + +/obj/item/clothing/head/helmet/space/eva/plasmaman/security + icon_state = "plasmamanSecurity_helmet0" + base_state = "plasmamanSecurity_helmet" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0c9ac105043..1655618eb8f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -470,4 +470,11 @@ else icon_state = initial(icon_state) item_state = initial(item_state) - usr.update_inv_wear_suit() \ No newline at end of file + usr.update_inv_wear_suit() + +/obj/item/clothing/suit/lordadmiral + name = "Lord Admiral's Coat" + desc = "You'll be the Ruler of the King's Navy in no time." + icon_state = "lordadmiral" + item_state = "lordadmiral" + allowed = list (/obj/item/weapon/gun) \ No newline at end of file diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 052eb50dd6f..0a1d3c49aba 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -78,4 +78,11 @@ name = "camo pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" - _color = "camopants" \ No newline at end of file + _color = "camopants" + +/obj/item/clothing/under/pants/chaps + name = "black leather assless chaps" + desc = "For those brave enough to weather the breeze." + icon_state = "chaps" + _color = "chaps" + flags = ONESIZEFITSALL \ No newline at end of file diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 1dd1956c7ab..0a2203eedcd 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -46,8 +46,8 @@ var/global/list/possibleEvents = list() // Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm possibleEvents[/datum/event/economic_event] = 300 - possibleEvents[/datum/event/trivial_news] = 400 - possibleEvents[/datum/event/mundane_news] = 300 + //possibleEvents[/datum/event/trivial_news] = 400 + //possibleEvents[/datum/event/mundane_news] = 300 possibleEvents[/datum/event/cargo_bonus] = 150 diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 604a4007ab9..08614d68c9c 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -293,12 +293,12 @@ /client/proc/event_manager_panel() set name = "Event Manager Panel" - set category = "Admin" + set category = "Event" if(event_manager) event_manager.Interact(usr) feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return - + /datum/event/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in! var/area/candidate = null @@ -343,7 +343,7 @@ break return candidate - + /datum/event/proc/num_players() var/players = 0 for(var/mob/living/carbon/human/P in player_list) diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 46103722c68..aa52f5c80a2 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -6,8 +6,36 @@ * Rewritten (except for player HTML) by N3X15 ***********************/ -// Open up WMP and play musique. -// TODO: Convert to VLC for cross-platform and ogg support. - N3X +// Open up VLC and play musique. +// Converted to VLC for cross-platform and ogg support. - N3X +var/const/PLAYER_HTML={" + + + +"} + +/* OLD, DO NOT USE. CONTROLS.CURRENTPOSITION IS BROKEN. var/const/PLAYER_HTML={" "} +*/ // Hook into the events we desire. /hook_handler/soundmanager diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 12673d50549..63dbfac240c 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -1,18 +1,15 @@ -/mob/living/carbon/verb/give() +/mob/living/carbon/verb/give(var/mob/living/carbon/target in oview(1)) set category = "IC" set name = "Give" - set src in view(1) - if(src.stat == 2 || usr.stat == 2 || src.client == null) - return - if(src == usr) - usr << "\red I feel stupider, suddenly." + + if(target.stat == 2 || usr.stat == 2|| target.client == null) return var/obj/item/I if(!usr.hand && usr.r_hand == null) - usr << "\red You don't have anything in your right hand to give to [src.name]" + usr << " You don't have anything in your right hand to give to [target.name]" return if(usr.hand && usr.l_hand == null) - usr << "\red You don't have anything in your left hand to give to [src.name]" + usr << " You don't have anything in your left hand to give to [target.name]" return if(usr.hand) I = usr.l_hand @@ -23,38 +20,38 @@ if((I.flags & NODROP) || (I.flags & ABSTRACT)) usr << "That's not exactly something you can give." return - if(src.r_hand == null || src.l_hand == null) - switch(alert(src,"[usr] wants to give you \a [I]?",,"Yes","No")) + if(target.r_hand == null || target.l_hand == null) + switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No")) if("Yes") if(!I) return if(!Adjacent(usr)) - usr << "\red You need to stay in reaching distance while giving an object." - src << "\red [usr.name] moved too far away." + usr << " You need to stay in reaching distance while giving an object." + target << " [usr.name] moved too far away." return if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I)) - usr << "\red You need to keep the item in your active hand." - src << "\red [usr.name] seem to have given up on giving \the [I.name] to you." + usr << " You need to keep the item in your active hand." + target << " [usr.name] seem to have given up on giving \the [I.name] to you." return - if(src.r_hand != null && src.l_hand != null) - src << "\red Your hands are full." - usr << "\red Their hands are full." + if(target.r_hand != null && target.l_hand != null) + target << " Your hands are full." + usr << " Their hands are full." return else usr.drop_item() - if(src.r_hand == null) - src.r_hand = I + if(target.r_hand == null) + target.r_hand = I else - src.l_hand = I - I.loc = src + target.l_hand = I + I.loc = target I.layer = 20 - I.add_fingerprint(src) + I.add_fingerprint(target) src.update_inv_l_hand() src.update_inv_r_hand() usr.update_inv_l_hand() usr.update_inv_r_hand() - src.visible_message("\blue [usr.name] handed \the [I.name] to [src.name].") + target.visible_message(" [usr.name] handed \the [I.name] to [target.name].") if("No") - src.visible_message("\red [usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.") + target.visible_message(" [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.") else - usr << "\red [src.name]'s hands are full." \ No newline at end of file + usr << " [target.name]'s hands are full." \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 95dee276004..03dba49370d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -466,7 +466,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc if(species.name=="Plasmaman") // Check if we're wearing our biosuit and mask. - if (!istype(wear_suit,/obj/item/clothing/suit/space/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/plasmaman)) + if (!istype(wear_suit,/obj/item/clothing/suit/space/eva/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/eva/plasmaman)) //testing("Plasmaman [src] leakin'. coverflags=[cover_flags]") // OH FUCK HE LEAKIN'. // This was OP. diff --git a/code/modules/mob/living/carbon/human/plasmaman/species.dm b/code/modules/mob/living/carbon/human/plasmaman/species.dm index edb0a7c8539..29e54e8ab8f 100644 --- a/code/modules/mob/living/carbon/human/plasmaman/species.dm +++ b/code/modules/mob/living/carbon/human/plasmaman/species.dm @@ -30,26 +30,48 @@ H.unEquip(H.wear_mask) H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask) - var/suit=/obj/item/clothing/suit/space/plasmaman - var/helm=/obj/item/clothing/head/helmet/space/plasmaman + var/suit=/obj/item/clothing/suit/space/eva/plasmaman + var/helm=/obj/item/clothing/head/helmet/space/eva/plasmaman var/tank_slot = slot_s_store var/tank_slot_name = "suit storage" switch(H.mind.assigned_role) - /* if("Research Director","Scientist","Geneticist","Roboticist") - suit=/obj/item/clothing/suit/space/vox/casual/science - helm=/obj/item/clothing/head/helmet/space/vox/casual/science - if("Chief Engineer","Station Engineer","Atmospheric Technician") - suit=/obj/item/clothing/suit/space/vox/casual/engineer - helm=/obj/item/clothing/head/helmet/space/vox/casual/engineer + suit=/obj/item/clothing/suit/space/eva/plasmaman/science + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/science + if("Chief Engineer","Station Engineer") + suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer + if("Atmospheric Technician") + suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech if("Head of Security","Warden","Detective","Security Officer") - suit=/obj/item/clothing/suit/space/vox/casual/security - helm=/obj/item/clothing/head/helmet/space/vox/casual/security + suit=/obj/item/clothing/suit/space/eva/plasmaman/security + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security if("Chief Medical Officer","Medical Doctor","Paramedic","Chemist") - suit=/obj/item/clothing/suit/space/vox/casual/medical - helm=/obj/item/clothing/head/helmet/space/vox/casual/medical - */ // For now. + suit=/obj/item/clothing/suit/space/eva/plasmaman/medical + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical + if("Bartender", "Chef") + suit=/obj/item/clothing/suit/space/eva/plasmaman/service + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/service + if("Cargo Technician", "Quartermaster") + suit=/obj/item/clothing/suit/space/eva/plasmaman/cargo + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/cargo + if("Shaft Miner") + suit=/obj/item/clothing/suit/space/eva/plasmaman/miner + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/miner + if("Botanist") + suit=/obj/item/clothing/suit/space/eva/plasmaman/botanist + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/botanist + if("Chaplain") + suit=/obj/item/clothing/suit/space/eva/plasmaman/chaplain + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain + if("Janitor") + suit=/obj/item/clothing/suit/space/eva/plasmaman/janitor + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor + if("Assistant") + suit=/obj/item/clothing/suit/space/eva/plasmaman/assistant + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant if("Clown","Mime") tank_slot=slot_r_hand tank_slot_name = "hand" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 12ef687c696..2c5e2b417c6 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -598,6 +598,32 @@ icon_state = "vox_shortquills" species_allowed = list("Vox") + vox_crestedquills + name = "Crested Vox Quills" + icon_state = "vox_crestedquills" + species_allowed = list("Vox") + + vox_tielquills + name = "Vox Tiel Quills" + icon_state = "vox_tielquills" + species_allowed = list("Vox") + + vox_emperorquills + name = "Vox Emperor Quills" + icon_state = "vox_emperorquills" + species_allowed = list("Vox") + + vox_keelquills + name = "Vox Keel Quills" + icon_state = "vox_keelquills" + species_allowed = list("Vox") + + vox_keetquills + name = "Vox Keet Quills" + icon_state = "vox_keetquills" + species_allowed = list("Vox") + + /datum/sprite_accessory/facial_hair taj_sideburns diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 2e7e39d9fea..4350591c548 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -6,7 +6,7 @@ if (istype(in_use, /obj/machinery/computer/shuttle_control/emergency)) var/obj/machinery/computer/shuttle_control/emergency/C = in_use C.reset_authorization() - + emergency_shuttle.shuttle_arrived() /datum/shuttle/ferry/emergency/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction) @@ -37,7 +37,7 @@ var/obj/machinery/computer/shuttle_control/emergency/C = user if (!C.has_authorization()) return 0 - + if(moving_status == SHUTTLE_STRANDED && C.has_authorization()) return 1 return ..() @@ -45,12 +45,12 @@ /datum/shuttle/ferry/emergency/can_force(var/mob/user) if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) var/obj/machinery/computer/shuttle_control/emergency/C = user - + //initiating or cancelling a launch ALWAYS requires authorization, but if we are already set to launch anyways than forcing does not. //this is so that people can force launch if the docking controller cannot safely undock without needing X heads to swipe. if (process_state != WAIT_LAUNCH && !C.has_authorization()) return 0 - + return ..() /datum/shuttle/ferry/emergency/can_cancel(var/mob/user) @@ -62,7 +62,7 @@ /datum/shuttle/ferry/emergency/launch(var/user) if (!can_launch(user)) return - + if(emergency_shuttle.no_escape) user << "The emergency shuttle has been disabled by Centcom." return @@ -155,7 +155,7 @@ /obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob, params) read_authorization(W) ..() - + /obj/machinery/computer/shuttle_control/emergency/emag_act(user as mob) if (!emagged) user << "\blue You short out the [src]'s authorization protocols." @@ -214,7 +214,7 @@ "docking_status" = shuttle.docking_controller? shuttle.docking_controller.get_docking_status() : null, "docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null, "can_launch" = shuttle.can_launch(src), - "can_cancel" = shuttle.can_cancel(src), + //"can_cancel" = shuttle.can_cancel(src), "can_force" = shuttle.can_force(src), "auth_list" = auth_list, "has_auth" = has_auth, @@ -236,7 +236,7 @@ if(href_list["removeid"]) var/dna_hash = href_list["removeid"] authorized -= dna_hash - + if(!emagged && href_list["scanid"]) //They selected an empty entry. Try to scan their id. if (ishuman(usr)) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 9eea53339be..7597231249e 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 7ed0f6e3f79..7b7992d4ce7 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ca5e197734d..3457e915399 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 6156fab8b26..3d93fb8aef7 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi index 7e93cf3901b..21824ea5389 100644 Binary files a/icons/mob/uniform_fat.dmi and b/icons/mob/uniform_fat.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1fdf5bbc625..fa5a45504c7 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4d796bb41b7..4a318be3e75 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 6bed53895d6..880b5346d1e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index b85721bcc27..3b53aeb7927 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 3dc1bcadfe8..d576f993bef 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index 4362cad34d2..267dfdfaca8 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -13,7 +13,7 @@ src << "The wiki URL is not set in the server configuration." return -#define CHANGELOG "https://github.com/ParadiseSS13/Paradise/commits/master" +#define CHANGELOG "https://github.com/ParadiseSS13/Paradise/issues?q=is%3Apr+is%3Aclosed" /client/verb/changes() set name = "Changelog" set desc = "Visit Github to check out the commits." diff --git a/nano/templates/escape_shuttle_control_console.tmpl b/nano/templates/escape_shuttle_control_console.tmpl index f3331313ad0..61627f558a9 100644 --- a/nano/templates/escape_shuttle_control_console.tmpl +++ b/nano/templates/escape_shuttle_control_console.tmpl @@ -77,7 +77,7 @@
{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch ? null : 'disabled' , null)}} - {{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}} +{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}} {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , data.can_force ? 'redButton' : null)}}
diff --git a/paradise.dme b/paradise.dme index 95f52d506e6..a59937230f9 100644 --- a/paradise.dme +++ b/paradise.dme @@ -994,6 +994,7 @@ #include "code\modules\clothing\spacesuits\ert.dm" #include "code\modules\clothing\spacesuits\miscellaneous.dm" #include "code\modules\clothing\spacesuits\ninja.dm" +#include "code\modules\clothing\spacesuits\plasmamen.dm" #include "code\modules\clothing\spacesuits\rig.dm" #include "code\modules\clothing\spacesuits\syndi.dm" #include "code\modules\clothing\spacesuits\void.dm"