\ - Acquire components and summon the Ark." - else - name = "Next Tier Requirements" - var/validservants = 0 - var/unconverted_ais_exist = FALSE - for(var/mob/living/L in living_mob_list) - if(is_servant_of_ratvar(L) && (ishuman(L) || issilicon(L))) - validservants++ - else if(isAI(L)) - unconverted_ais_exist++ - var/req_servants = 0 - var/req_caches = 0 - var/req_cv = 0 - var/req_ai = FALSE - desc = "Requirements for [current_state] Scripture:" - switch(current_state) //get our requirements based on the tier - if(SCRIPTURE_SCRIPT) - req_servants = SCRIPT_SERVANT_REQ - req_caches = SCRIPT_CACHE_REQ - if(SCRIPTURE_APPLICATION) - req_servants = APPLICATION_SERVANT_REQ - req_caches = APPLICATION_CACHE_REQ - req_cv = APPLICATION_CV_REQ - if(SCRIPTURE_REVENANT) - req_servants = REVENANT_SERVANT_REQ - req_caches = REVENANT_CACHE_REQ - req_cv = REVENANT_CV_REQ - if(SCRIPTURE_JUDGEMENT) - req_servants = JUDGEMENT_SERVANT_REQ - req_caches = JUDGEMENT_CACHE_REQ - req_cv = JUDGEMENT_CV_REQ - req_ai = TRUE - desc += "
[validservants]/[req_servants] Servants" - if(validservants < req_servants) - icon_state += "-servants" //in this manner, generate an icon key based on what we're missing - else - desc += ": \[CHECK\]" - desc += "
[clockwork_caches]/[req_caches] Tinkerer's Caches" - if(clockwork_caches < req_caches) - icon_state += "-caches" - else - desc += ": \[CHECK\]" - if(req_cv) //cv only shows up if the tier requires it - desc += "
[clockwork_construction_value]/[req_cv] Construction Value" - if(clockwork_construction_value < req_cv) - icon_state += "-cv" - else - desc += ": \[CHECK\]" - if(req_ai) //same for ai - if(unconverted_ais_exist) - if(unconverted_ais_exist > 1) - desc += "
[unconverted_ais_exist] unconverted AIs exist!
" - else - desc += "
An unconverted AI exists!" - icon_state += "-ai" - else - desc += "
No unconverted AIs exist: \[CHECK\]" - -/obj/screen/alert/clockwork/infodump - name = "Global Records" - desc = "You shouldn't be seeing this description, because it should be dynamically generated." - icon_state = "clockinfo" - -/obj/screen/alert/clockwork/infodump/MouseEntered(location,control,params) - if(ratvar_awakens) - desc = "CHETR
NYY
HAGEHUGF-NAQ-UBABE
RATVAR." - else - var/servants = 0 - var/validservants = 0 - var/unconverted_ais_exist = FALSE - var/list/scripture_states = scripture_unlock_check() - for(var/mob/living/L in living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(ishuman(L) || issilicon(L)) - validservants++ - else if(isAI(L)) - unconverted_ais_exist++ - if(servants > 1) - if(validservants > 1) - desc = "[servants] Servants, [validservants] of which count towards scripture.
" - else - desc = "[servants] Servants, [validservants ? "[validservants] of which counts":"none of which count"] towards scripture.
" - else - desc = "[servants] Servant, who [validservants ? "counts":"does not count"] towards scripture.
" - desc += "[clockwork_caches ? "[clockwork_caches] Tinkerer's Caches.":"No Tinkerer's Caches, construct one!"]
\ - [clockwork_construction_value] Construction Value.
" - if(clockwork_daemons) - desc += "[clockwork_daemons] Tinkerer's Daemons: [servants * 0.2 < clockwork_daemons ? "DISABLED":"ACTIVE"]
" - else - desc += "No Tinkerer's Daemons.
" - for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in all_clockwork_objects) - var/area/gate_area = get_area(G) - desc += "Ark Location: [uppertext(gate_area.map_name)]
" - if(G.ratvar_portal) - desc += "Seconds until Ratvar's arrival: [G.get_arrival_text(TRUE)]
" - else - desc += "Seconds until Proselytization: [G.get_arrival_text(TRUE)]
" - if(unconverted_ais_exist) - if(unconverted_ais_exist > 1) - desc += "[unconverted_ais_exist] unconverted AIs exist!
" - else - desc += "An unconverted AI exists!
" - if(scripture_states[SCRIPTURE_REVENANT]) - var/inathneq_available = clockwork_generals_invoked["inath-neq"] <= world.time - var/sevtug_available = clockwork_generals_invoked["sevtug"] <= world.time - var/nezbere_available = clockwork_generals_invoked["nezbere"] <= world.time - var/nezcrentr_available = clockwork_generals_invoked["nzcrentr"] <= world.time - if(inathneq_available || sevtug_available || nezbere_available || nezcrentr_available) - desc += "Generals available:[inathneq_available ? "
INATH-NEQ":""][sevtug_available ? "
SEVTUG":""]\ - [nezbere_available ? "
NEZBERE":""][nezcrentr_available ? "
NZCRENTR":""]
" - else - desc += "Generals available: NONE
" - else - desc += "Generals available: NONE
" - for(var/i in scripture_states) - if(i != SCRIPTURE_DRIVER) //ignore the always-unlocked stuff - desc += "[i] Scripture: [scripture_states[i] ? "UNLOCKED":"LOCKED"]
" - ..() - //GUARDIANS /obj/screen/alert/cancharge @@ -457,23 +297,6 @@ so as to remain in compliance with the most up-to-date laws." icon_state = "newlaw" timeout = 300 -/obj/screen/alert/hackingapc - name = "Hacking APC" - desc = "An Area Power Controller is being hacked. When the process is \ - complete, you will have exclusive control of it, and you will gain \ - additional processing time to unlock more malfunction abilities." - icon_state = "hackingapc" - timeout = 600 - var/atom/target = null - -/obj/screen/alert/hackingapc/Click() - if(!usr || !usr.client) return - if(!target) return - var/mob/living/silicon/ai/AI = usr - var/turf/T = get_turf(target) - if(T) - AI.eyeobj.setLoc(T) - //MECHS /obj/screen/alert/low_mech_integrity @@ -536,7 +359,6 @@ so as to remain in compliance with the most up-to-date laws." if(isliving(usr)) var/mob/living/L = usr return L.resist() - // PRIVATE = only edit, use, or override these if you're editing the system as a whole // Re-render all alerts - also called in /datum/hud/show_hud() because it's needed there diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 1f8b1c2488..20cfab176f 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -21,46 +21,50 @@ if(T) T.fire(A) + /obj/screen/alien/plasma_display icon = 'icons/mob/screen_gen.dmi' icon_state = "power_display2" name = "plasma stored" screen_loc = ui_alienplasmadisplay - -/obj/screen/alien/alien_queen_finder - icon = 'icons/mob/screen_alien.dmi' - icon_state = "queen_finder" - name = "queen sense" - desc = "Allows you to sense the general direction of your Queen." - screen_loc = ui_alien_queen_finder - - -/datum/hud/alien - ui_style_icon = 'icons/mob/screen_alien.dmi' - -/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner, ui_style = 'icons/mob/screen_alien.dmi') +/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner) ..() var/obj/screen/using + var/obj/screen/inventory/inv_box //equippable shit //hands - build_hand_slots(ui_style) + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = 'icons/mob/screen_alien.dmi' + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = 'icons/mob/screen_alien.dmi' + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box //begin buttons using = new /obj/screen/swap_hand() - using.icon = ui_style + using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "swap_1" - using.screen_loc = ui_swaphand_position(owner,1) + using.screen_loc = ui_swaphand1 static_inventory += using using = new /obj/screen/swap_hand() - using.icon = ui_style + using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) + using.screen_loc = ui_swaphand2 static_inventory += using using = new /obj/screen/act_intent/alien() @@ -74,28 +78,23 @@ H.leap_icon.screen_loc = ui_alien_storage_r static_inventory += H.leap_icon - using = new/obj/screen/wheel/talk - using.screen_loc = ui_alien_talk_wheel - wheels += using - static_inventory += using - using = new /obj/screen/drop() - using.icon = ui_style + using.icon = 'icons/mob/screen_alien.dmi' using.screen_loc = ui_drop_throw static_inventory += using using = new /obj/screen/resist() - using.icon = ui_style + using.icon = 'icons/mob/screen_alien.dmi' using.screen_loc = ui_pull_resist hotkeybuttons += using throw_icon = new /obj/screen/throw_catch() - throw_icon.icon = ui_style + throw_icon.icon = 'icons/mob/screen_alien.dmi' throw_icon.screen_loc = ui_drop_throw hotkeybuttons += throw_icon pull_icon = new /obj/screen/pull() - pull_icon.icon = ui_style + pull_icon.icon = 'icons/mob/screen_alien.dmi' pull_icon.update_icon(mymob) pull_icon.screen_loc = ui_pull_resist static_inventory += pull_icon @@ -111,10 +110,6 @@ alien_plasma_display = new /obj/screen/alien/plasma_display() infodisplay += alien_plasma_display - if(!istype(mymob, /mob/living/carbon/alien/humanoid/royal/queen)) - alien_queen_finder = new /obj/screen/alien/alien_queen_finder - infodisplay += alien_queen_finder - zone_select = new /obj/screen/zone_sel/alien() zone_select.update_icon(mymob) static_inventory += zone_select @@ -125,18 +120,22 @@ inv_slots[inv.slot_id] = inv inv.update_icon() -/datum/hud/alien/persistent_inventory_update() +/datum/hud/alien/persistant_inventory_update() if(!mymob) return var/mob/living/carbon/alien/humanoid/H = mymob if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in H.held_items) - I.screen_loc = ui_hand_position(H.get_held_index_of_item(I)) - H.client.screen += I + if(H.r_hand) + H.r_hand.screen_loc = ui_rhand + H.client.screen += H.r_hand + if(H.l_hand) + H.l_hand.screen_loc = ui_lhand + H.client.screen += H.l_hand else - for(var/obj/item/I in H.held_items) - I.screen_loc = null - H.client.screen -= I + if(H.r_hand) + H.r_hand.screen_loc = null + if(H.l_hand) + H.l_hand.screen_loc = null /mob/living/carbon/alien/humanoid/create_mob_hud() if(client && !hud_used) diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index 2392e349fe..a1464fa996 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -13,19 +13,13 @@ nightvisionicon = new /obj/screen/alien/nightvision() nightvisionicon.screen_loc = ui_alien_nightvision infodisplay += nightvisionicon - alien_queen_finder = new /obj/screen/alien/alien_queen_finder() - infodisplay += alien_queen_finder + pull_icon = new /obj/screen/pull() pull_icon.icon = 'icons/mob/screen_alien.dmi' pull_icon.update_icon(mymob) pull_icon.screen_loc = ui_pull_resist hotkeybuttons += pull_icon - using = new/obj/screen/wheel/talk - using.screen_loc = ui_alien_talk_wheel - wheels += using - static_inventory += using - zone_select = new /obj/screen/zone_sel/alien() zone_select.update_icon(mymob) static_inventory += zone_select diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index c3cc3851dc..66e4e1fd3c 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -34,15 +34,12 @@ desc = "Moves your camera to your blob core." /obj/screen/blob/JumpToCore/MouseEntered(location,control,params) - if(hud && hud.mymob && isovermind(hud.mymob)) - var/mob/camera/blob/B = hud.mymob + if(isovermind(usr)) + var/mob/camera/blob/B = usr if(!B.placed) - name = "Place Blob Core" - desc = "Attempt to place your blob core at this location." + openToolTip(usr,src,params,title = "Place Blob Core",content = "Attempt to place your blob core at this location.", theme = "blob") else - name = initial(name) - desc = initial(desc) - ..() + ..() /obj/screen/blob/JumpToCore/Click() if(isovermind(usr)) @@ -54,7 +51,7 @@ /obj/screen/blob/Blobbernaut icon_state = "ui_blobbernaut" name = "Produce Blobbernaut (40)" - desc = "Produces a strong, smart blobbernaut from a factory blob for 40 resources.
The factory blob used will become fragile and unable to produce spores." + desc = "Produces a strong, smart blobbernaut from a factory blob for 40 points.
The factory blob used will become fragile and unable to produce spores." /obj/screen/blob/Blobbernaut/Click() if(isovermind(usr)) @@ -64,7 +61,7 @@ /obj/screen/blob/ResourceBlob icon_state = "ui_resource" name = "Produce Resource Blob (40)" - desc = "Produces a resource blob for 40 resources.
Resource blobs will give you resources every few seconds." + desc = "Produces a resource blob for 40 points.
Resource blobs will give you points every few seconds." /obj/screen/blob/ResourceBlob/Click() if(isovermind(usr)) @@ -73,8 +70,8 @@ /obj/screen/blob/NodeBlob icon_state = "ui_node" - name = "Produce Node Blob (50)" - desc = "Produces a node blob for 50 resources.
Node blobs will expand and activate nearby resource and factory blobs." + name = "Produce Node Blob (60)" + desc = "Produces a node blob for 60 points.
Node blobs will expand and activate nearby resource and factory blobs." /obj/screen/blob/NodeBlob/Click() if(isovermind(usr)) @@ -84,7 +81,7 @@ /obj/screen/blob/FactoryBlob icon_state = "ui_factory" name = "Produce Factory Blob (60)" - desc = "Produces a factory blob for 60 resources.
Factory blobs will produce spores every few seconds." + desc = "Produces a factory blob for 60 points.
Factory blobs will produce spores every few seconds." /obj/screen/blob/FactoryBlob/Click() if(isovermind(usr)) @@ -94,18 +91,15 @@ /obj/screen/blob/ReadaptChemical icon_state = "ui_chemswap" name = "Readapt Chemical (40)" - desc = "Randomly rerolls your chemical for 40 resources." + desc = "Randomly rerolls your chemical for 40 points." /obj/screen/blob/ReadaptChemical/MouseEntered(location,control,params) - if(hud && hud.mymob && isovermind(hud.mymob)) - var/mob/camera/blob/B = hud.mymob + if(isovermind(usr)) + var/mob/camera/blob/B = usr if(B.free_chem_rerolls) - name = "Readapt Chemical (FREE)" - desc = "Randomly rerolls your chemical for free." + openToolTip(usr,src,params,title = "Readapt Chemical (FREE)",content = "Randomly rerolls your chemical for free.", theme = "blob") else - name = initial(name) - desc = initial(desc) - ..() + ..() /obj/screen/blob/ReadaptChemical/Click() if(isovermind(usr)) @@ -115,7 +109,7 @@ /obj/screen/blob/RelocateCore icon_state = "ui_swap" name = "Relocate Core (80)" - desc = "Swaps a node and your core for 80 resources." + desc = "Swaps a node and your core for 80 points." /obj/screen/blob/RelocateCore/Click() if(isovermind(usr)) @@ -132,7 +126,6 @@ blobpwrdisplay.screen_loc = ui_health blobpwrdisplay.mouse_opacity = 0 blobpwrdisplay.layer = ABOVE_HUD_LAYER - blobpwrdisplay.plane = ABOVE_HUD_PLANE infodisplay += blobpwrdisplay healths = new /obj/screen/healths/blob() @@ -148,7 +141,6 @@ using = new /obj/screen/blob/JumpToCore() using.screen_loc = ui_zonesel - using.hud = src static_inventory += using using = new /obj/screen/blob/Blobbernaut() @@ -160,16 +152,15 @@ static_inventory += using using = new /obj/screen/blob/NodeBlob() - using.screen_loc = ui_hand_position(2) + using.screen_loc = ui_lhand static_inventory += using using = new /obj/screen/blob/FactoryBlob() - using.screen_loc = ui_hand_position(1) + using.screen_loc = ui_rhand static_inventory += using using = new /obj/screen/blob/ReadaptChemical() using.screen_loc = ui_storage1 - using.hud = src static_inventory += using using = new /obj/screen/blob/RelocateCore() diff --git a/code/_onclick/hud/clockwork_marauder.dm b/code/_onclick/hud/clockwork_marauder.dm deleted file mode 100644 index 0b5c2e0f24..0000000000 --- a/code/_onclick/hud/clockwork_marauder.dm +++ /dev/null @@ -1,64 +0,0 @@ -/datum/hud/marauder - var/obj/screen/hosthealth - var/obj/screen/blockchance - var/obj/screen/counterchance - -/datum/hud/marauder/New(mob/living/simple_animal/hostile/guardian/owner) - ..() - var/obj/screen/using - - healths = new /obj/screen/healths/clock() - infodisplay += healths - - hosthealth = new /obj/screen/healths/clock() - hosthealth.screen_loc = ui_internal - infodisplay += hosthealth - - using = new /obj/screen/marauder/emerge() - using.screen_loc = ui_zonesel - static_inventory += using - - blockchance = new /obj/screen/marauder/blockchance() - blockchance.screen_loc = ui_hand_position(2) - infodisplay += blockchance - - counterchance = new /obj/screen/marauder/counterchance() - counterchance.screen_loc = ui_hand_position(1) - infodisplay += counterchance - -/datum/hud/marauder/Destroy() - blockchance = null - counterchance = null - hosthealth = null - return ..() - -/mob/living/simple_animal/hostile/clockwork/marauder/create_mob_hud() - if(client && !hud_used) - hud_used = new /datum/hud/marauder(src, ui_style2icon(client.prefs.UI_style)) - - -/obj/screen/marauder - icon = 'icons/mob/clockwork_mobs.dmi' - -/obj/screen/marauder/emerge - icon_state = "marauder_emerge" - name = "Emerge/Return" - desc = "Emerge or Return." - -/obj/screen/marauder/emerge/Click() - if(istype(usr, /mob/living/simple_animal/hostile/clockwork/marauder)) - var/mob/living/simple_animal/hostile/clockwork/marauder/M = usr - if(M.is_in_host()) - M.try_emerge() - else - M.return_to_host() - -/obj/screen/marauder/blockchance - icon_state = "marauder_block" - name = "Block Chance" - desc = "Clang." - -/obj/screen/marauder/counterchance - icon_state = "marauder_counter" - name = "Counter Chance" - desc = "Slash." diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm index 0cd0b6a6a9..0ddaeccd23 100644 --- a/code/_onclick/hud/devil.dm +++ b/code/_onclick/hud/devil.dm @@ -5,6 +5,7 @@ /datum/hud/devil/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi') ..() var/obj/screen/using + var/obj/screen/inventory/inv_box using = new /obj/screen/drop() using.icon = ui_style @@ -17,24 +18,36 @@ pull_icon.screen_loc = ui_drone_pull static_inventory += pull_icon - build_hand_slots(ui_style) + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box using = new /obj/screen/inventory() using.name = "hand" using.icon = ui_style using.icon_state = "swap_1_m" - using.screen_loc = ui_swaphand_position(owner,1) + using.screen_loc = ui_swaphand1 using.layer = HUD_LAYER - using.plane = HUD_PLANE static_inventory += using using = new /obj/screen/inventory() using.name = "hand" using.icon = ui_style using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) + using.screen_loc = ui_swaphand2 using.layer = HUD_LAYER - using.plane = HUD_PLANE static_inventory += using zone_select = new /obj/screen/zone_sel() @@ -46,19 +59,23 @@ infodisplay += devilsouldisplay -/datum/hud/devil/persistent_inventory_update() +/datum/hud/devil/persistant_inventory_update() if(!mymob) return var/mob/living/carbon/true_devil/D = mymob if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in D.held_items) - I.screen_loc = ui_hand_position(D.get_held_index_of_item(I)) - D.client.screen += I + if(D.r_hand) + D.r_hand.screen_loc = ui_rhand + D.client.screen += D.r_hand + if(D.l_hand) + D.l_hand.screen_loc = ui_lhand + D.client.screen += D.l_hand else - for(var/obj/item/I in D.held_items) - I.screen_loc = null - D.client.screen -= I + if(D.r_hand) + D.r_hand.screen_loc = null + if(D.l_hand) + D.l_hand.screen_loc = null /mob/living/carbon/true_devil/create_mob_hud() if(client && !hud_used) diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm index b6708b266d..631686b089 100644 --- a/code/_onclick/hud/drones.dm +++ b/code/_onclick/hud/drones.dm @@ -1,14 +1,42 @@ -/datum/hud/dextrous/drone/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi') +/datum/hud/drone/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi') ..() + var/obj/screen/using var/obj/screen/inventory/inv_box + using = new /obj/screen/drop() + using.icon = ui_style + using.screen_loc = ui_drone_drop + static_inventory += using + + pull_icon = new /obj/screen/pull() + pull_icon.icon = ui_style + pull_icon.update_icon(mymob) + pull_icon.screen_loc = ui_drone_pull + static_inventory += pull_icon + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box + inv_box = new /obj/screen/inventory() inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" // inv_box.icon_full = "template" inv_box.screen_loc = ui_drone_storage - inv_box.slot_id = slot_generic_dextrous_storage + inv_box.slot_id = slot_drone_storage static_inventory += inv_box inv_box = new /obj/screen/inventory() @@ -20,6 +48,26 @@ inv_box.slot_id = slot_head static_inventory += inv_box + using = new /obj/screen/swap_hand() + using.icon = ui_style + using.icon_state = "swap_1_m" + using.screen_loc = ui_swaphand1 + static_inventory += using + + using = new /obj/screen/swap_hand() + using.icon = ui_style + using.icon_state = "swap_2" + using.screen_loc = ui_swaphand2 + static_inventory += using + + zone_select = new /obj/screen/zone_sel() + zone_select.icon = ui_style + zone_select.update_icon(mymob) + + using = new /obj/screen/inventory/craft + using.icon = ui_style + static_inventory += using + for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src @@ -27,7 +75,7 @@ inv.update_icon() -/datum/hud/dextrous/drone/persistent_inventory_update() +/datum/hud/drone/persistant_inventory_update() if(!mymob) return var/mob/living/simple_animal/drone/D = mymob @@ -45,4 +93,19 @@ if(D.head) D.head.screen_loc = null - ..() + if(hud_version != HUD_STYLE_NOHUD) + if(D.r_hand) + D.r_hand.screen_loc = ui_rhand + D.client.screen += D.r_hand + if(D.l_hand) + D.l_hand.screen_loc = ui_lhand + D.client.screen += D.l_hand + else + if(D.r_hand) + D.r_hand.screen_loc = null + if(D.l_hand) + D.l_hand.screen_loc = null + +/mob/living/simple_animal/drone/create_mob_hud() + if(client && !hud_used) + hud_used = new /datum/hud/drone(src, ui_style2icon(client.prefs.UI_style)) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 4d05e42f40..0baf90a473 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -60,7 +60,6 @@ icon_state = "default" screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER - plane = FULLSCREEN_PLANE mouse_opacity = 0 var/severity = 0 @@ -72,22 +71,18 @@ /obj/screen/fullscreen/brute icon_state = "brutedamageoverlay" layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE /obj/screen/fullscreen/oxy icon_state = "oxydamageoverlay" layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE /obj/screen/fullscreen/crit icon_state = "passage" layer = CRIT_LAYER - plane = FULLSCREEN_PLANE /obj/screen/fullscreen/blind icon_state = "blackimageoverlay" layer = BLIND_LAYER - plane = FULLSCREEN_PLANE /obj/screen/fullscreen/impaired icon_state = "impairedoverlay" @@ -102,7 +97,7 @@ screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" -/obj/screen/fullscreen/flash/static +/obj/screen/fullscreen/flash/noise icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "noise" @@ -111,18 +106,3 @@ icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "druggy" - -/obj/screen/fullscreen/color_vision - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "flash" - alpha = 80 - -/obj/screen/fullscreen/color_vision/green - color = "#00ff00" - -/obj/screen/fullscreen/color_vision/red - color = "#ff0000" - -/obj/screen/fullscreen/color_vision/blue - color = "#0000ff" \ No newline at end of file diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm index f20730483a..fe772d94ca 100644 --- a/code/_onclick/hud/generic_dextrous.dm +++ b/code/_onclick/hud/generic_dextrous.dm @@ -2,42 +2,39 @@ /datum/hud/dextrous/New(mob/living/owner, ui_style = 'icons/mob/screen_midnight.dmi') ..() var/obj/screen/using + var/obj/screen/inventory/inv_box using = new /obj/screen/drop() using.icon = ui_style using.screen_loc = ui_drone_drop static_inventory += using - pull_icon = new /obj/screen/pull() - pull_icon.icon = ui_style - pull_icon.update_icon(mymob) - pull_icon.screen_loc = ui_drone_pull - static_inventory += pull_icon + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box - build_hand_slots(ui_style) + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_1_m" - using.screen_loc = ui_swaphand_position(owner,1) + using.screen_loc = ui_swaphand1 static_inventory += using using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) - static_inventory += using - - zone_select = new /obj/screen/zone_sel() - zone_select.icon = ui_style - zone_select.update_icon(mymob) - - using = new /obj/screen/inventory/craft - using.icon = ui_style - static_inventory += using - - using = new /obj/screen/inventory/area_creator - using.icon = ui_style + using.screen_loc = ui_swaphand2 static_inventory += using mymob.client.screen = list() @@ -48,24 +45,19 @@ inv_slots[inv.slot_id] = inv inv.update_icon() -/datum/hud/dextrous/persistent_inventory_update() +/datum/hud/dextrous/persistant_inventory_update() if(!mymob) return var/mob/living/D = mymob if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in D.held_items) - I.screen_loc = ui_hand_position(D.get_held_index_of_item(I)) - D.client.screen += I + if(D.r_hand) + D.r_hand.screen_loc = ui_rhand + D.client.screen += D.r_hand + if(D.l_hand) + D.l_hand.screen_loc = ui_lhand + D.client.screen += D.l_hand else - for(var/obj/item/I in D.held_items) - I.screen_loc = null - D.client.screen -= I - - -//Dextrous simple mobs can use hands! -/mob/living/simple_animal/create_mob_hud() - if(client && !hud_used) - if(dextrous) - hud_used = new dextrous_hud_type(src, ui_style2icon(client.prefs.UI_style)) - else - ..() + if(D.r_hand) + D.r_hand.screen_loc = null + if(D.l_hand) + D.l_hand.screen_loc = null diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 546f0a6a02..aa39055e94 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -36,15 +36,7 @@ var/mob/dead/observer/G = usr G.dead_tele() -/obj/screen/ghost/pai - name = "pAI Candidate" - icon_state = "pai" - -/obj/screen/ghost/pai/Click() - var/mob/dead/observer/G = usr - G.register_pai() - -/datum/hud/ghost/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi') +/datum/hud/ghost/New(mob/owner) ..() var/mob/dead/observer/G = mymob if(!G.client.prefs.ghost_hud) @@ -69,19 +61,14 @@ using.screen_loc = ui_ghost_teleport static_inventory += using - using = new /obj/screen/ghost/pai() - using.screen_loc = ui_ghost_pai - static_inventory += using - /datum/hud/ghost/show_hud() var/mob/dead/observer/G = mymob mymob.client.screen = list() - create_parallax() - if(G.client.prefs.ghost_hud) - mymob.client.screen += static_inventory - + if(!G.client.prefs.ghost_hud) + return + mymob.client.screen += static_inventory /mob/dead/observer/create_mob_hud() if(client && !hud_used) - hud_used = new /datum/hud/ghost(src, ui_style2icon(client.prefs.UI_style)) + hud_used = new /datum/hud/ghost(src) diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm index dc57c2b25c..0a9601385f 100644 --- a/code/_onclick/hud/guardian.dm +++ b/code/_onclick/hud/guardian.dm @@ -7,11 +7,11 @@ infodisplay += healths using = new /obj/screen/guardian/Manifest() - using.screen_loc = ui_hand_position(2) + using.screen_loc = ui_rhand static_inventory += using using = new /obj/screen/guardian/Recall() - using.screen_loc = ui_hand_position(1) + using.screen_loc = ui_lhand static_inventory += using using = new owner.toggle_button_type() @@ -29,69 +29,8 @@ /mob/living/simple_animal/hostile/guardian/create_mob_hud() if(client && !hud_used) - if(dextrous) - ..() - else - hud_used = new /datum/hud/guardian(src, ui_style2icon(client.prefs.UI_style)) + hud_used = new /datum/hud/guardian(src) -/datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner, ui_style = 'icons/mob/screen_midnight.dmi') //for a dextrous guardian - ..() - var/obj/screen/using - if(istype(owner, /mob/living/simple_animal/hostile/guardian/dextrous)) - var/obj/screen/inventory/inv_box - - inv_box = new /obj/screen/inventory() - inv_box.name = "internal storage" - inv_box.icon = ui_style - inv_box.icon_state = "suit_storage" - inv_box.screen_loc = ui_id - inv_box.slot_id = slot_generic_dextrous_storage - static_inventory += inv_box - - using = new /obj/screen/guardian/Communicate() - using.screen_loc = ui_sstore1 - static_inventory += using - - else - - using = new /obj/screen/guardian/Communicate() - using.screen_loc = ui_id - static_inventory += using - - healths = new /obj/screen/healths/guardian() - infodisplay += healths - - using = new /obj/screen/guardian/Manifest() - using.screen_loc = ui_belt - static_inventory += using - - using = new /obj/screen/guardian/Recall() - using.screen_loc = ui_back - static_inventory += using - - using = new owner.toggle_button_type() - using.screen_loc = ui_storage2 - static_inventory += using - - using = new /obj/screen/guardian/ToggleLight() - using.screen_loc = ui_inventory - static_inventory += using - -/datum/hud/dextrous/guardian/persistent_inventory_update() - if(!mymob) - return - if(istype(mymob, /mob/living/simple_animal/hostile/guardian/dextrous)) - var/mob/living/simple_animal/hostile/guardian/dextrous/D = mymob - - if(hud_shown) - if(D.internal_storage) - D.internal_storage.screen_loc = ui_id - D.client.screen += D.internal_storage - else - if(D.internal_storage) - D.internal_storage.screen_loc = null - - ..() /obj/screen/guardian icon = 'icons/mob/guardian.dmi' diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 56123031d9..591e47f83d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -9,7 +9,7 @@ var/hud_shown = 1 //Used for the HUD toggle (F12) var/hud_version = 1 //Current displayed version of the HUD - var/inventory_shown = 0 //Equipped item inventory + var/inventory_shown = 1 //the inventory var/show_intent_icons = 0 var/hotkey_ui_hidden = 0 //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) @@ -19,7 +19,6 @@ var/obj/screen/blobpwrdisplay var/obj/screen/alien_plasma_display - var/obj/screen/alien_queen_finder var/obj/screen/devil/soul_counter/devilsouldisplay @@ -33,16 +32,12 @@ var/obj/screen/throw_icon var/obj/screen/module_store_icon - var/list/wheels = list() //list of the wheel screen objects - var/list/static_inventory = list() //the screen objects which are static var/list/toggleable_inventory = list() //the screen objects which can be hidden var/list/obj/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...) var/list/screenoverlays = list() //the screen objects used as whole screen overlays (flash, damageoverlay, etc...) var/list/inv_slots[slots_amt] // /obj/screen/inventory objects, ordered by their slot ID. - var/list/hand_slots // /obj/screen/inventory/hand objects, assoc list of "[held_index]" = object - var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle var/action_buttons_hidden = 0 @@ -51,21 +46,10 @@ var/obj/screen/healthdoll var/obj/screen/internals - var/ui_style_icon = 'icons/mob/screen_midnight.dmi' - -/datum/hud/New(mob/owner , ui_style = 'icons/mob/screen_midnight.dmi') +/datum/hud/New(mob/owner) mymob = owner - - ui_style_icon = ui_style - hide_actions_toggle = new - hide_actions_toggle.InitialiseIcon(src) - - hand_slots = list() - - for(var/mytype in subtypesof(/obj/screen/plane_master)) - var/obj/screen/plane_master/instance = new mytype() - plane_masters["[instance.plane]"] = instance + hide_actions_toggle.InitialiseIcon(mymob) /datum/hud/Destroy() if(mymob.hud_used == src) @@ -77,8 +61,6 @@ qdel(module_store_icon) module_store_icon = null - wheels = null //all wheels are also in static_inventory - if(static_inventory.len) for(var/thing in static_inventory) qdel(thing) @@ -114,16 +96,10 @@ lingstingdisplay = null blobpwrdisplay = null alien_plasma_display = null - alien_queen_finder = null deity_power_display = null deity_follower_display = null nightvisionicon = null - if(plane_masters.len) - for(var/thing in plane_masters) - qdel(plane_masters[thing]) - plane_masters.Cut() - if(screenoverlays.len) for(var/thing in screenoverlays) qdel(thing) @@ -136,15 +112,13 @@ hud_used = new /datum/hud(src) //Version denotes which style should be displayed. blank or 0 means "next version" -/datum/hud/proc/show_hud(version = 0,mob/viewmob) +/datum/hud/proc/show_hud(version = 0) if(!ismob(mymob)) return 0 if(!mymob.client) return 0 - var/mob/screenmob = viewmob || mymob - - screenmob.client.screen = list() + mymob.client.screen = list() var/display_hud_version = version if(!display_hud_version) //If 0 or blank, display the next hud version @@ -156,13 +130,13 @@ if(HUD_STYLE_STANDARD) //Default HUD hud_shown = 1 //Governs behavior of other procs if(static_inventory.len) - screenmob.client.screen += static_inventory - if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.inventory_shown) - screenmob.client.screen += toggleable_inventory + mymob.client.screen += static_inventory + if(toggleable_inventory.len && inventory_shown) + mymob.client.screen += toggleable_inventory if(hotkeybuttons.len && !hotkey_ui_hidden) - screenmob.client.screen += hotkeybuttons + mymob.client.screen += hotkeybuttons if(infodisplay.len) - screenmob.client.screen += infodisplay + mymob.client.screen += infodisplay mymob.client.screen += hide_actions_toggle @@ -172,48 +146,45 @@ if(HUD_STYLE_REDUCED) //Reduced HUD hud_shown = 0 //Governs behavior of other procs if(static_inventory.len) - screenmob.client.screen -= static_inventory + mymob.client.screen -= static_inventory if(toggleable_inventory.len) - screenmob.client.screen -= toggleable_inventory + mymob.client.screen -= toggleable_inventory if(hotkeybuttons.len) - screenmob.client.screen -= hotkeybuttons + mymob.client.screen -= hotkeybuttons if(infodisplay.len) - screenmob.client.screen += infodisplay + mymob.client.screen += infodisplay //These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay - for(var/h in hand_slots) - var/obj/screen/hand = hand_slots[h] - if(hand) - screenmob.client.screen += hand + if(inv_slots[slot_l_hand]) + mymob.client.screen += inv_slots[slot_l_hand] //we want the hands to be visible + if(inv_slots[slot_r_hand]) + mymob.client.screen += inv_slots[slot_r_hand] //we want the hands to be visible if(action_intent) - screenmob.client.screen += action_intent //we want the intent switcher visible + mymob.client.screen += action_intent //we want the intent switcher visible action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. if(HUD_STYLE_NOHUD) //No HUD hud_shown = 0 //Governs behavior of other procs if(static_inventory.len) - screenmob.client.screen -= static_inventory + mymob.client.screen -= static_inventory if(toggleable_inventory.len) - screenmob.client.screen -= toggleable_inventory + mymob.client.screen -= toggleable_inventory if(hotkeybuttons.len) - screenmob.client.screen -= hotkeybuttons + mymob.client.screen -= hotkeybuttons if(infodisplay.len) - screenmob.client.screen -= infodisplay + mymob.client.screen -= infodisplay - if(plane_masters.len) - for(var/thing in plane_masters) - screenmob.client.screen += plane_masters[thing] hud_version = display_hud_version - persistent_inventory_update(screenmob) + persistant_inventory_update() mymob.update_action_buttons(1) reorganize_alerts() mymob.reload_fullscreen() - create_parallax() + update_parallax_existence() -/datum/hud/human/show_hud(version = 0,mob/viewmob) +/datum/hud/human/show_hud(version = 0) ..() - hidden_inventory_update(viewmob) + hidden_inventory_update() /datum/hud/robot/show_hud(version = 0) ..() @@ -222,19 +193,8 @@ /datum/hud/proc/hidden_inventory_update() return -/datum/hud/proc/persistent_inventory_update(mob/viewer) - if(!mymob) - return - var/mob/living/L = mymob - - var/mob/screenmob = viewer || L - - for(var/X in wheels) - var/obj/screen/wheel/W = X - if(W.toggled) - screenmob.client.screen |= W.buttons_list - else - screenmob.client.screen -= W.buttons_list +/datum/hud/proc/persistant_inventory_update() + return //Triggered when F12 is pressed (Unless someone changed something in the DMF) /mob/verb/button_pressed_F12() @@ -246,35 +206,3 @@ usr << "Switched HUD mode. Press F12 to toggle." else usr << "This mob type does not use a HUD." - - -//(re)builds the hand ui slots, throwing away old ones -//not really worth jugglying existing ones so we just scrap+rebuild -//9/10 this is only called once per mob and only for 2 hands -/datum/hud/proc/build_hand_slots(ui_style = 'icons/mob/screen_midnight.dmi') - for(var/h in hand_slots) - var/obj/screen/inventory/hand/H = hand_slots[h] - if(H) - static_inventory -= H - hand_slots = list() - var/obj/screen/inventory/hand/hand_box - for(var/i in 1 to mymob.held_items.len) - hand_box = new /obj/screen/inventory/hand() - hand_box.name = mymob.get_held_index_name(i) - hand_box.icon = ui_style - hand_box.icon_state = "hand_[mymob.held_index_to_dir(i)]" - hand_box.screen_loc = ui_hand_position(i) - hand_box.held_index = i - hand_slots["[i]"] = hand_box - hand_box.hud = src - static_inventory += hand_box - hand_box.update_icon() - - var/i = 1 - for(var/obj/screen/swap_hand/SH in static_inventory) - SH.screen_loc = ui_swaphand_position(mymob,!(i % 2) ? 2: 1) - i++ - for(var/obj/screen/human/equip/E in static_inventory) - E.screen_loc = ui_equip_position(mymob) - if(mymob.hud_used) - show_hud(HUD_STYLE_STANDARD,mymob) \ No newline at end of file diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 8ec31271be..9fa64a77ff 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -6,22 +6,14 @@ icon_state = "toggle" /obj/screen/human/toggle/Click() - - var/mob/targetmob = usr - - if(isobserver(usr)) - if(ishuman(usr.client.eye) && (usr.client.eye != usr)) - var/mob/M = usr.client.eye - targetmob = M - - if(usr.hud_used.inventory_shown && targetmob.hud_used) + if(usr.hud_used.inventory_shown) usr.hud_used.inventory_shown = 0 - usr.client.screen -= targetmob.hud_used.toggleable_inventory + usr.client.screen -= usr.hud_used.toggleable_inventory else usr.hud_used.inventory_shown = 1 - usr.client.screen += targetmob.hud_used.toggleable_inventory + usr.client.screen += usr.hud_used.toggleable_inventory - targetmob.hud_used.hidden_inventory_update(usr) + usr.hud_used.hidden_inventory_update() /obj/screen/human/equip name = "equip" @@ -70,8 +62,6 @@ screen_loc = ui_lingstingdisplay /obj/screen/ling/sting/Click() - if(isobserver(usr)) - return var/mob/living/carbon/U = usr U.unset_sting() @@ -87,6 +77,7 @@ /datum/hud/human/New(mob/living/carbon/human/owner, ui_style = 'icons/mob/screen_midnight.dmi') ..() + var/obj/screen/using var/obj/screen/inventory/inv_box @@ -94,15 +85,6 @@ using.icon = ui_style static_inventory += using - using = new/obj/screen/wheel/talk - using.icon = ui_style - wheels += using - static_inventory += using - - using = new /obj/screen/inventory/area_creator - using.icon = ui_style - static_inventory += using - using = new /obj/screen/act_intent() using.icon_state = mymob.a_intent static_inventory += using @@ -110,7 +92,7 @@ using = new /obj/screen/mov_intent() using.icon = ui_style - using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") + using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") using.screen_loc = ui_movi static_inventory += using @@ -137,18 +119,32 @@ inv_box.screen_loc = ui_oclothing toggleable_inventory += inv_box - build_hand_slots(ui_style) + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_1" - using.screen_loc = ui_swaphand_position(owner,1) + using.screen_loc = ui_swaphand1 static_inventory += using using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) + using.screen_loc = ui_swaphand2 static_inventory += using inv_box = new /obj/screen/inventory() @@ -169,15 +165,6 @@ inv_box.slot_id = slot_wear_mask toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() - inv_box.name = "neck" - inv_box.icon = ui_style - inv_box.icon_state = "neck" -// inv_box.icon_full = "template" - inv_box.screen_loc = ui_neck - inv_box.slot_id = slot_neck - toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() inv_box.name = "back" inv_box.icon = ui_style @@ -226,7 +213,7 @@ using = new /obj/screen/human/equip() using.icon = ui_style - using.screen_loc = ui_equip_position(mymob) + using.screen_loc = ui_equip static_inventory += using inv_box = new /obj/screen/inventory() @@ -317,111 +304,102 @@ zone_select.update_icon(mymob) static_inventory += zone_select + inventory_shown = 0 + for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src inv_slots[inv.slot_id] = inv inv.update_icon() -/datum/hud/human/hidden_inventory_update(mob/viewer) +/datum/hud/human/hidden_inventory_update() if(!mymob) return var/mob/living/carbon/human/H = mymob - - var/mob/screenmob = viewer || H - - if(screenmob.hud_used.inventory_shown && screenmob.hud_used.hud_shown) + if(inventory_shown && hud_shown) if(H.shoes) H.shoes.screen_loc = ui_shoes - screenmob.client.screen += H.shoes + H.client.screen += H.shoes if(H.gloves) H.gloves.screen_loc = ui_gloves - screenmob.client.screen += H.gloves + H.client.screen += H.gloves if(H.ears) H.ears.screen_loc = ui_ears - screenmob.client.screen += H.ears + H.client.screen += H.ears if(H.glasses) H.glasses.screen_loc = ui_glasses - screenmob.client.screen += H.glasses + H.client.screen += H.glasses if(H.w_uniform) H.w_uniform.screen_loc = ui_iclothing - screenmob.client.screen += H.w_uniform + H.client.screen += H.w_uniform if(H.wear_suit) H.wear_suit.screen_loc = ui_oclothing - screenmob.client.screen += H.wear_suit + H.client.screen += H.wear_suit if(H.wear_mask) H.wear_mask.screen_loc = ui_mask - screenmob.client.screen += H.wear_mask - if(H.wear_neck) - H.wear_neck.screen_loc = ui_neck - screenmob.client.screen += H.wear_neck + H.client.screen += H.wear_mask if(H.head) H.head.screen_loc = ui_head - screenmob.client.screen += H.head + H.client.screen += H.head else - if(H.shoes) screenmob.client.screen -= H.shoes - if(H.gloves) screenmob.client.screen -= H.gloves - if(H.ears) screenmob.client.screen -= H.ears - if(H.glasses) screenmob.client.screen -= H.glasses - if(H.w_uniform) screenmob.client.screen -= H.w_uniform - if(H.wear_suit) screenmob.client.screen -= H.wear_suit - if(H.wear_mask) screenmob.client.screen -= H.wear_mask - if(H.wear_neck) screenmob.client.screen -= H.wear_neck - if(H.head) screenmob.client.screen -= H.head + if(H.shoes) H.shoes.screen_loc = null + if(H.gloves) H.gloves.screen_loc = null + if(H.ears) H.ears.screen_loc = null + if(H.glasses) H.glasses.screen_loc = null + if(H.w_uniform) H.w_uniform.screen_loc = null + if(H.wear_suit) H.wear_suit.screen_loc = null + if(H.wear_mask) H.wear_mask.screen_loc = null + if(H.head) H.head.screen_loc = null - - -/datum/hud/human/persistent_inventory_update(mob/viewer) +/datum/hud/human/persistant_inventory_update() if(!mymob) return - ..() var/mob/living/carbon/human/H = mymob - - var/mob/screenmob = viewer || H - - if(screenmob.hud_used) - if(screenmob.hud_used.hud_shown) - if(H.s_store) - H.s_store.screen_loc = ui_sstore1 - screenmob.client.screen += H.s_store - if(H.wear_id) - H.wear_id.screen_loc = ui_id - screenmob.client.screen += H.wear_id - if(H.belt) - H.belt.screen_loc = ui_belt - screenmob.client.screen += H.belt - if(H.back) - H.back.screen_loc = ui_back - screenmob.client.screen += H.back - if(H.l_store) - H.l_store.screen_loc = ui_storage1 - screenmob.client.screen += H.l_store - if(H.r_store) - H.r_store.screen_loc = ui_storage2 - screenmob.client.screen += H.r_store - else - if(H.s_store) - screenmob.client.screen -= H.s_store - if(H.wear_id) - screenmob.client.screen -= H.wear_id - if(H.belt) - screenmob.client.screen -= H.belt - if(H.back) - screenmob.client.screen -= H.back - if(H.l_store) - screenmob.client.screen -= H.l_store - if(H.r_store) - screenmob.client.screen -= H.r_store + if(hud_shown) + if(H.s_store) + H.s_store.screen_loc = ui_sstore1 + H.client.screen += H.s_store + if(H.wear_id) + H.wear_id.screen_loc = ui_id + H.client.screen += H.wear_id + if(H.belt) + H.belt.screen_loc = ui_belt + H.client.screen += H.belt + if(H.back) + H.back.screen_loc = ui_back + H.client.screen += H.back + if(H.l_store) + H.l_store.screen_loc = ui_storage1 + H.client.screen += H.l_store + if(H.r_store) + H.r_store.screen_loc = ui_storage2 + H.client.screen += H.r_store + else + if(H.s_store) + H.s_store.screen_loc = null + if(H.wear_id) + H.wear_id.screen_loc = null + if(H.belt) + H.belt.screen_loc = null + if(H.back) + H.back.screen_loc = null + if(H.l_store) + H.l_store.screen_loc = null + if(H.r_store) + H.r_store.screen_loc = null if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in H.held_items) - I.screen_loc = ui_hand_position(H.get_held_index_of_item(I)) - screenmob.client.screen += I + if(H.r_hand) + H.r_hand.screen_loc = ui_rhand + H.client.screen += H.r_hand + if(H.l_hand) + H.l_hand.screen_loc = ui_lhand + H.client.screen += H.l_hand else - for(var/obj/item/I in H.held_items) - I.screen_loc = null - screenmob.client.screen -= I - + if(H.r_hand) + H.r_hand.screen_loc = null + if(H.l_hand) + H.l_hand.screen_loc = null /mob/living/carbon/human/verb/toggle_hotkey_verbs() set category = "OOC" diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index f0f8f7689e..dea167cd6c 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -12,32 +12,41 @@ using = new /obj/screen/mov_intent() using.icon = ui_style - using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") + using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") using.screen_loc = ui_movi static_inventory += using - using = new/obj/screen/wheel/talk - using.icon = ui_style - wheels += using - static_inventory += using - using = new /obj/screen/drop() using.icon = ui_style using.screen_loc = ui_drop_throw static_inventory += using - build_hand_slots(ui_style) + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "right hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_r" + inv_box.screen_loc = ui_rhand + inv_box.slot_id = slot_r_hand + static_inventory += inv_box + + inv_box = new /obj/screen/inventory/hand() + inv_box.name = "left hand" + inv_box.icon = ui_style + inv_box.icon_state = "hand_l" + inv_box.screen_loc = ui_lhand + inv_box.slot_id = slot_l_hand + static_inventory += inv_box using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_1_m" //extra wide! - using.screen_loc = ui_swaphand_position(owner,1) + using.screen_loc = ui_swaphand1 static_inventory += using using = new /obj/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) + using.screen_loc = ui_swaphand2 static_inventory += using inv_box = new /obj/screen/inventory() @@ -49,15 +58,6 @@ inv_box.slot_id = slot_wear_mask static_inventory += inv_box - inv_box = new /obj/screen/inventory() - inv_box.name = "neck" - inv_box.icon = ui_style - inv_box.icon_state = "neck" -// inv_box.icon_full = "template" - inv_box.screen_loc = ui_monkey_neck - inv_box.slot_id = slot_neck - static_inventory += inv_box - inv_box = new /obj/screen/inventory() inv_box.name = "head" inv_box.icon = ui_style @@ -118,7 +118,7 @@ inv_slots[inv.slot_id] = inv inv.update_icon() -/datum/hud/monkey/persistent_inventory_update() +/datum/hud/monkey/persistant_inventory_update() if(!mymob) return var/mob/living/carbon/monkey/M = mymob @@ -130,9 +130,6 @@ if(M.wear_mask) M.wear_mask.screen_loc = ui_monkey_mask M.client.screen += M.wear_mask - if(M.wear_neck) - M.wear_neck.screen_loc = ui_monkey_neck - M.client.screen += M.wear_neck if(M.head) M.head.screen_loc = ui_monkey_head M.client.screen += M.head @@ -145,13 +142,17 @@ M.head.screen_loc = null if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in M.held_items) - I.screen_loc = ui_hand_position(M.get_held_index_of_item(I)) - M.client.screen += I + if(M.r_hand) + M.r_hand.screen_loc = ui_rhand + M.client.screen += M.r_hand + if(M.l_hand) + M.l_hand.screen_loc = ui_lhand + M.client.screen += M.l_hand else - for(var/obj/item/I in M.held_items) - I.screen_loc = null - M.client.screen -= I + if(M.r_hand) + M.r_hand.screen_loc = null + if(M.l_hand) + M.l_hand.screen_loc = null /mob/living/carbon/monkey/create_mob_hud() if(client && !hud_used) diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm index fa2a4ebf31..8cd1a12233 100644 --- a/code/_onclick/hud/other_mobs.dm +++ b/code/_onclick/hud/other_mobs.dm @@ -7,7 +7,35 @@ mymob.client.screen = list() mymob.client.screen += mymob.client.void -/mob/living/brain/create_mob_hud() +/mob/living/carbon/brain/create_mob_hud() if(client && !hud_used) hud_used = new /datum/hud/brain(src) +/datum/hud/hog_god/New(mob/owner) + ..() + healths = new /obj/screen/healths/deity() + infodisplay += healths + + deity_power_display = new /obj/screen/deity_power_display() + infodisplay += deity_power_display + + deity_follower_display = new /obj/screen/deity_follower_display() + infodisplay += deity_follower_display + + +/mob/camera/god/create_mob_hud() + if(client && !hud_used) + hud_used = new /datum/hud/hog_god(src) + +/obj/screen/deity_power_display + name = "Faith" + icon_state = "deity_power" + screen_loc = ui_deitypower + layer = HUD_LAYER + +/obj/screen/deity_follower_display + name = "Followers" + icon_state = "deity_followers" + screen_loc = ui_deityfollowers + layer = HUD_LAYER + diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index 3a09fabab7..7f0e283dde 100644 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -1,268 +1,254 @@ +/* + * This file handles all parallax-related business once the parallax itself is initialized with the rest of the HUD + */ +#define PARALLAX_IMAGE_WIDTH 15 +#define PARALLAX_IMAGE_TILES (PARALLAX_IMAGE_WIDTH**2) -/client - var/list/parallax_layers - var/list/parallax_layers_cached - var/static/list/parallax_static_layers_tail = newlist(/obj/screen/parallax_pmaster, /obj/screen/parallax_space_whitifier) - var/atom/movable/movingmob - var/turf/previous_turf - var/dont_animate_parallax //world.time of when we can state animate()ing parallax again - var/last_parallax_shift //world.time of last update - var/parallax_throttle = 0 //ds between updates - var/parallax_movedir = 0 - var/parallax_layers_max = 3 - var/parallax_animate_timer +var/list/parallax_on_clients = list() -/datum/hud/proc/create_parallax() - var/client/C = mymob.client - if (!apply_parallax_pref()) +/obj/screen/parallax + var/base_offset_x = 0 + var/base_offset_y = 0 + mouse_opacity = 0 + icon = 'icons/turf/space.dmi' + icon_state = "blank" + name = "space parallax" + screen_loc = "CENTER,CENTER" + blend_mode = BLEND_ADD + layer = AREA_LAYER + plane = PLANE_SPACE_PARALLAX + var/parallax_speed = 0 + +/obj/screen/plane_master + appearance_flags = PLANE_MASTER + screen_loc = "CENTER,CENTER" + +/obj/screen/plane_master/parallax_master + plane = PLANE_SPACE_PARALLAX + blend_mode = BLEND_MULTIPLY + color = list( + 1,0,0,0, + 0,1,0,0, + 0,0,1,0, + 0,0,0,0, + 0,0,0,1) + +/obj/screen/plane_master/parallax_spacemaster //Turns space white, causing the parallax to only show in areas with opacity. Somehow + plane = PLANE_SPACE_BACKGROUND + color = list( + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 1,1,1,1, + 0,0,0,0) + +/obj/screen/plane_master/parallax_spacemaster/New() + ..() + overlays += image(icon = 'icons/mob/screen1.dmi', icon_state = "blank") + +/obj/screen/plane_master/parallax_dustmaster + plane = PLANE_SPACE_DUST + color = list(0,0,0,0) + +/datum/hud/proc/update_parallax_existence() + if(!parallax_initialized) return + initialize_parallax() + update_parallax() + update_parallax_values() - if(!length(C.parallax_layers_cached)) - C.parallax_layers_cached = list() - C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view) - C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view) - - C.parallax_layers = C.parallax_layers_cached.Copy() - - if (length(C.parallax_layers) > C.parallax_layers_max) - C.parallax_layers.len = C.parallax_layers_max - - C.screen |= (C.parallax_layers + C.parallax_static_layers_tail) - -/datum/hud/proc/remove_parallax() +/datum/hud/proc/initialize_parallax() var/client/C = mymob.client - C.screen -= (C.parallax_layers_cached + C.parallax_static_layers_tail) - C.parallax_layers = null -/datum/hud/proc/apply_parallax_pref() - var/client/C = mymob.client - switch(C.prefs.parallax) - if (PARALLAX_INSANE) - C.parallax_throttle = FALSE - C.parallax_layers_max = 4 - return TRUE + if(!C.parallax_master) + C.parallax_master = PoolOrNew(/obj/screen/plane_master/parallax_master) + if(!C.parallax_spacemaster) + C.parallax_spacemaster = PoolOrNew(/obj/screen/plane_master/parallax_spacemaster) + if(!C.parallax_dustmaster) + C.parallax_dustmaster = PoolOrNew(/obj/screen/plane_master/parallax_dustmaster) - if (PARALLAX_MED) - C.parallax_throttle = PARALLAX_DELAY_MED - C.parallax_layers_max = 2 - return TRUE + if(!C.parallax.len) + for(var/obj/screen/parallax/bgobj in parallax_icon) + var/obj/screen/parallax/parallax_layer = PoolOrNew(/obj/screen/parallax) + parallax_layer.appearance = bgobj.appearance + parallax_layer.base_offset_x = bgobj.base_offset_x + parallax_layer.base_offset_y = bgobj.base_offset_y + parallax_layer.parallax_speed = bgobj.parallax_speed + parallax_layer.screen_loc = bgobj.screen_loc + C.parallax += parallax_layer + if(bgobj.parallax_speed) + C.parallax_movable += parallax_layer - if (PARALLAX_LOW) - C.parallax_throttle = PARALLAX_DELAY_LOW - C.parallax_layers_max = 1 - return TRUE + if(!C.parallax_offset.len) + C.parallax_offset["horizontal"] = 0 + C.parallax_offset["vertical"] = 0 - if (PARALLAX_DISABLE) - return FALSE - - else - C.parallax_throttle = PARALLAX_DELAY_DEFAULT - C.parallax_layers_max = 3 - return TRUE - -/datum/hud/proc/update_parallax_pref() - remove_parallax() - create_parallax() - -// This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller can append their animation) -/datum/hud/proc/set_parallax_movedir(new_parallax_movedir) - . = FALSE - var/client/C = mymob.client - if(new_parallax_movedir == C.parallax_movedir) - return - var/animatedir = new_parallax_movedir - if(new_parallax_movedir == FALSE) - var/animate_time = 0 - for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing - L.icon_state = initial(L.icon_state) - L.update_o(C.view) - var/T = PARALLAX_LOOP_TIME / L.speed - if (T > animate_time) - animate_time = T - C.dont_animate_parallax = world.time + min(animate_time, PARALLAX_LOOP_TIME) - animatedir = C.parallax_movedir - - var/matrix/newtransform - switch(animatedir) - if(NORTH) - newtransform = matrix(1, 0, 0, 0, 1, 480) - if(SOUTH) - newtransform = matrix(1, 0, 0, 0, 1,-480) - if(EAST) - newtransform = matrix(1, 0, 480, 0, 1, 0) - if(WEST) - newtransform = matrix(1, 0,-480, 0, 1, 0) - - var/shortesttimer - for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing - - var/T = PARALLAX_LOOP_TIME / L.speed - if (isnull(shortesttimer)) - shortesttimer = T - if (T < shortesttimer) - shortesttimer = T - L.transform = newtransform - animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = ANIMATION_END_NOW) - if (new_parallax_movedir) - L.transform = newtransform - animate(transform = matrix(), time = T) //queue up another animate so lag doesn't create a shutter - - C.parallax_movedir = new_parallax_movedir - if (C.parallax_animate_timer) - deltimer(C.parallax_animate_timer) - C.parallax_animate_timer = addtimer(src, .update_parallax_motionblur, min(shortesttimer, PARALLAX_LOOP_TIME), TIMER_NORMAL, C, animatedir, new_parallax_movedir, newtransform) - -/datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform) - C.parallax_animate_timer = FALSE - for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing - if (!new_parallax_movedir) - animate(L) - continue - - var/newstate = initial(L.icon_state) - if (animatedir) - if(animatedir == NORTH || animatedir == SOUTH) - newstate += "_vertical" - else - newstate += "_horizontal" - - var/T = PARALLAX_LOOP_TIME / L.speed - - if (newstate in icon_states(L.icon)) - L.icon_state = newstate - L.update_o(C.view) - - L.transform = newtransform - - animate(L, transform = matrix(), time = T, loop = -1, flags = ANIMATION_END_NOW) + C.screen |= C.parallax_dustmaster /datum/hud/proc/update_parallax() var/client/C = mymob.client + if(C.prefs.space_parallax) + parallax_on_clients |= C + for(var/obj/screen/parallax/bgobj in C.parallax) + C.screen |= bgobj + C.screen |= C.parallax_master + C.screen |= C.parallax_spacemaster + if(C.prefs.space_dust) + C.parallax_dustmaster.color = list( + 1,0,0,0, + 0,1,0,0, + 0,0,1,0, + 0,0,0,1) + else + C.parallax_dustmaster.color = list(0,0,0,0) + else + for(var/obj/screen/parallax/bgobj in C.parallax) + C.screen -= bgobj + parallax_on_clients -= C + C.screen -= C.parallax_master + C.screen -= C.parallax_spacemaster + C.parallax_dustmaster.color = list(0,0,0,0) + +/datum/hud/proc/update_parallax_values() + var/client/C = mymob.client + if(!parallax_initialized) + return + + if(!(locate(/turf/open/space) in trange(C.view,get_turf(C.eye)))) + return + + //ACTUALLY MOVING THE PARALLAX var/turf/posobj = get_turf(C.eye) - var/area/areaobj = posobj.loc - // Update the movement direction of the parallax if necessary (for shuttles) - set_parallax_movedir(areaobj.parallax_movedir) - - var/force if(!C.previous_turf || (C.previous_turf.z != posobj.z)) C.previous_turf = posobj - force = TRUE - - if (!force && world.time < C.last_parallax_shift+C.parallax_throttle) - return //Doing it this way prevents parallax layers from "jumping" when you change Z-Levels. - var/offset_x = posobj.x - C.previous_turf.x - var/offset_y = posobj.y - C.previous_turf.y + var/offsetx = C.parallax_offset["horizontal"] + posobj.x - C.previous_turf.x + var/offsety = C.parallax_offset["vertical"] + posobj.y - C.previous_turf.y + C.parallax_offset["horizontal"] = offsetx + C.parallax_offset["vertical"] = offsety - if(!offset_x && !offset_y && !force) - return - - var/last_delay = world.time - C.last_parallax_shift - last_delay = min(last_delay, C.parallax_throttle) C.previous_turf = posobj - C.last_parallax_shift = world.time - for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing - if (L.view_sized != C.view) - L.update_o(C.view) - var/change_x = offset_x * L.speed - L.offset_x -= change_x - var/change_y = offset_y * L.speed - L.offset_y -= change_y - if(L.offset_x > 240) - L.offset_x -= 480 - if(L.offset_x < -240) - L.offset_x += 480 - if(L.offset_y > 240) - L.offset_y -= 480 - if(L.offset_y < -240) - L.offset_y += 480 + var/maxoffset = 480 //480 = (15 tiles * 32 icon_size * 3 grid size / 2) - (15 tiles * 32 icon size / 2) for centering + var/minoffset = -960 //960 = (15 tiles * 32 icon_size * 3 grid size / 2) + (15 tiles * 32 icon size / 2) for centering + for(var/obj/screen/parallax/bgobj in C.parallax_movable) + var/accumulated_offset_x = bgobj.base_offset_x - round(offsetx * bgobj.parallax_speed * C.prefs.parallax_speed) + var/accumulated_offset_y = bgobj.base_offset_y - round(offsety * bgobj.parallax_speed * C.prefs.parallax_speed) - if(!areaobj.parallax_movedir && C.dont_animate_parallax <= world.time && (offset_x || offset_y) && abs(offset_x) <= max(C.parallax_throttle/world.tick_lag+1,1) && abs(offset_y) <= max(C.parallax_throttle/world.tick_lag+1,1) && (round(abs(change_x)) > 1 || round(abs(change_y)) > 1)) - L.transform = matrix(1, 0, offset_x*L.speed, 0, 1, offset_y*L.speed) - animate(L, transform=matrix(), time = last_delay) + if(accumulated_offset_x > maxoffset) + accumulated_offset_x -= 1440 //3x3 grid, 15 tiles * 32 icon_size * 3 grid size + if(accumulated_offset_x < minoffset) + accumulated_offset_x += 1440 - L.screen_loc = "CENTER-7:[round(L.offset_x,1)],CENTER-7:[round(L.offset_y,1)]" + if(accumulated_offset_y > maxoffset) + accumulated_offset_y -= 1440 + if(accumulated_offset_y < minoffset) + accumulated_offset_y += 1440 -/atom/movable/proc/update_parallax_contents() - if(length(client_mobs_in_contents)) - for(var/thing in client_mobs_in_contents) - var/mob/M = thing - if(M && M.client && M.hud_used && length(M.client.parallax_layers)) - M.hud_used.update_parallax() + bgobj.screen_loc = "CENTER:[accumulated_offset_x],CENTER:[accumulated_offset_y]" -/obj/screen/parallax_layer - icon = 'icons/effects/parallax.dmi' - var/speed = 1 - var/offset_x = 0 - var/offset_y = 0 - var/view_sized - blend_mode = BLEND_ADD - plane = PLANE_SPACE_PARALLAX - screen_loc = "CENTER-7,CENTER-7" - mouse_opacity = 0 +//Parallax generation code below +#define PARALLAX4_ICON_NUMBER 20 +#define PARALLAX3_ICON_NUMBER 14 +#define PARALLAX2_ICON_NUMBER 10 -/obj/screen/parallax_layer/New(view) - ..() - if (!view) - view = world.view - update_o(view) +/datum/subsystem/parallax/proc/create_global_parallax_icons() + var/list/plane1 = list() + var/list/plane2 = list() + var/list/plane3 = list() + var/list/pixel_x = list() + var/list/pixel_y = list() + var/index = 1 + for(var/i = 0 to (PARALLAX_IMAGE_TILES-1)) + for(var/j = 1 to 9) + plane1 += rand(1,26) + plane2 += rand(1,26) + plane3 += rand(1,26) + pixel_x += world.icon_size * (i%PARALLAX_IMAGE_WIDTH) + pixel_y += world.icon_size * round(i/PARALLAX_IMAGE_WIDTH) -/obj/screen/parallax_layer/proc/update_o(view) - if (!view) - view = world.view - var/list/new_overlays = list() - var/count = Ceiling(view/(480/world.icon_size))+1 - for(var/x in -count to count) - for(var/y in -count to count) - if(x == 0 && y == 0) - continue - var/image/I = image(icon, null, icon_state) - I.transform = matrix(1, 0, x*480, 0, 1, y*480) - new_overlays += I + for(var/i in 0 to 8) + var/obj/screen/parallax/parallax_layer = PoolOrNew(/obj/screen/parallax) - overlays = new_overlays - view_sized = view + var/list/L = list() + for(var/j in 1 to PARALLAX_IMAGE_TILES) + if(plane1[j+i*PARALLAX_IMAGE_TILES] <= PARALLAX4_ICON_NUMBER) + var/image/I = image('icons/turf/space_parallax4.dmi',"[plane1[j+i*PARALLAX_IMAGE_TILES]]") + I.pixel_x = pixel_x[j] + I.pixel_y = pixel_y[j] + L += I -/obj/screen/parallax_layer/layer_1 - icon_state = "layer1" - speed = 0.6 - layer = 1 + parallax_layer.overlays = L + parallax_layer.parallax_speed = 0 + parallax_layer.calibrate_parallax(i+1) + parallax_icon[index] = parallax_layer + index++ -/obj/screen/parallax_layer/layer_2 - icon_state = "layer2" - speed = 1 - layer = 2 + for(var/i in 0 to 8) + var/obj/screen/parallax/parallax_layer = PoolOrNew(/obj/screen/parallax) -/obj/screen/parallax_pmaster - appearance_flags = PLANE_MASTER - plane = PLANE_SPACE_PARALLAX - blend_mode = BLEND_MULTIPLY - mouse_opacity = FALSE - screen_loc = "CENTER-7,CENTER-7" + var/list/L = list() + for(var/j in 1 to PARALLAX_IMAGE_TILES) + if(plane2[j+i*PARALLAX_IMAGE_TILES] <= PARALLAX3_ICON_NUMBER) + var/image/I = image('icons/turf/space_parallax3.dmi',"[plane2[j+i*PARALLAX_IMAGE_TILES]]") + I.pixel_x = pixel_x[j] + I.pixel_y = pixel_y[j] + L += I -/obj/screen/parallax_space_whitifier - appearance_flags = PLANE_MASTER - plane = PLANE_SPACE - color = list( - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 1, 1, 1, 1, - 0, 0, 0, 0 - ) - screen_loc = "CENTER-7,CENTER-7" + parallax_layer.overlays = L + parallax_layer.parallax_speed = 0.5 + parallax_layer.calibrate_parallax(i+1) + parallax_icon[index] = parallax_layer + index++ + for(var/i in 0 to 8) + var/obj/screen/parallax/parallax_layer = PoolOrNew(/obj/screen/parallax) + var/list/L = list() + for(var/j in 1 to PARALLAX_IMAGE_TILES) + if(plane3[j+i*PARALLAX_IMAGE_TILES] <= PARALLAX2_ICON_NUMBER) + var/image/I = image('icons/turf/space_parallax2.dmi',"[plane3[j+i*PARALLAX_IMAGE_TILES]]") + I.pixel_x = pixel_x[j] + I.pixel_y = pixel_y[j] + L += I -#undef LOOP_NONE -#undef LOOP_NORMAL -#undef LOOP_REVERSE -#undef LOOP_TIME \ No newline at end of file + parallax_layer.overlays = L + parallax_layer.parallax_speed = 1 + parallax_layer.calibrate_parallax(i+1) + parallax_icon[index] = parallax_layer + index++ + + parallax_initialized = 1 + +/obj/screen/parallax/proc/calibrate_parallax(var/i) + if(!i) return + + /* Placement of screen objects + 1 2 3 + 4 5 6 + 7 8 9 + */ + base_offset_x = -PARALLAX_IMAGE_WIDTH*world.icon_size/2 + base_offset_y = -PARALLAX_IMAGE_WIDTH*world.icon_size/2 + + switch(i) + if(1,4,7) + base_offset_x -= world.icon_size*PARALLAX_IMAGE_WIDTH + if(3,6,9) + base_offset_x += world.icon_size*PARALLAX_IMAGE_WIDTH + switch(i) + if(1,2,3) + base_offset_y += world.icon_size*PARALLAX_IMAGE_WIDTH + if(7,8,9) + base_offset_y -= world.icon_size*PARALLAX_IMAGE_WIDTH + + screen_loc = "CENTER:[base_offset_x],CENTER:[base_offset_y]" + +#undef PARALLAX4_ICON_NUMBER +#undef PARALLAX3_ICON_NUMBER +#undef PARALLAX2_ICON_NUMBER +#undef PARALLAX_IMAGE_WIDTH +#undef PARALLAX_IMAGE_TILES diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm deleted file mode 100644 index eda44bda06..0000000000 --- a/code/_onclick/hud/plane_master.dm +++ /dev/null @@ -1,28 +0,0 @@ -/obj/screen/plane_master - screen_loc = "CENTER" - icon_state = "blank" - appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR - blend_mode = BLEND_OVERLAY - -/obj/screen/plane_master/New() - if(blend_mode == BLEND_MULTIPLY) - //What is this? Read http://www.byond.com/forum/?post=2141928 - var/image/backdrop = image('icons/mob/screen_gen.dmi', "black") - backdrop.transform = matrix(200, 0, 0, 0, 200, 0) - backdrop.layer = BACKGROUND_LAYER - backdrop.blend_mode = BLEND_OVERLAY - overlays += backdrop - ..() - -/obj/screen/plane_master/game_world - name = "game world plane master" - plane = GAME_PLANE - blend_mode = BLEND_OVERLAY - -/obj/screen/plane_master/lighting - name = "lighting plane master" - plane = LIGHTING_PLANE - blend_mode = BLEND_OVERLAY -// blend_mode = BLEND_MULTIPLY -// color = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,0, 0.1,0.1,0.1,0) - mouse_opacity = 0 diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 4c4764d3a5..5a5b7c200e 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -5,15 +5,9 @@ name = "cyborg module" icon_state = "nomod" -/obj/screen/robot/Click() - if(isobserver(usr)) - return 1 - /obj/screen/robot/module/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr - if(R.module.type != /obj/item/weapon/robot_module) + if(R.module) R.hud_used.toggle_show_robot_modules() return 1 R.pick_module() @@ -23,8 +17,6 @@ icon_state = "inv1" /obj/screen/robot/module1/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.toggle_module(1) @@ -33,8 +25,6 @@ icon_state = "inv2" /obj/screen/robot/module2/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.toggle_module(2) @@ -43,8 +33,6 @@ icon_state = "inv3" /obj/screen/robot/module3/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.toggle_module(3) @@ -53,8 +41,6 @@ icon_state = "radio" /obj/screen/robot/radio/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.radio.interact(R) @@ -63,8 +49,6 @@ icon_state = "store" /obj/screen/robot/store/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.uneq_active() @@ -73,8 +57,6 @@ icon_state = "lamp0" /obj/screen/robot/lamp/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.control_headlamp() @@ -83,24 +65,14 @@ icon_state = "ionpulse0" /obj/screen/robot/thrusters/Click() - if(..()) - return var/mob/living/silicon/robot/R = usr R.toggle_ionpulse() -/datum/hud/robot - ui_style_icon = 'icons/mob/screen_cyborg.dmi' - -/datum/hud/robot/New(mob/owner, ui_style = 'icons/mob/screen_cyborg.dmi') +/datum/hud/robot/New(mob/owner) ..() var/mob/living/silicon/robot/mymobR = mymob var/obj/screen/using - using = new/obj/screen/wheel/talk - using.screen_loc = ui_borg_talk_wheel - wheels += using - static_inventory += using - //Radio using = new /obj/screen/robot/radio() using.screen_loc = ui_borg_radio @@ -161,9 +133,9 @@ infodisplay += healths //Installed Module - mymobR.hands = new /obj/screen/robot/module() - mymobR.hands.screen_loc = ui_borg_module - static_inventory += mymobR.hands + mymob.hands = new /obj/screen/robot/module() + mymob.hands.screen_loc = ui_borg_module + static_inventory += mymob.hands //Store module_store_icon = new /obj/screen/robot/store() @@ -182,53 +154,50 @@ /datum/hud/proc/toggle_show_robot_modules() - if(!iscyborg(mymob)) return + if(!isrobot(mymob)) return - var/mob/living/silicon/robot/R = mymob + var/mob/living/silicon/robot/r = mymob - R.shown_robot_modules = !R.shown_robot_modules + r.shown_robot_modules = !r.shown_robot_modules update_robot_modules_display() -/datum/hud/proc/update_robot_modules_display(mob/viewer) - if(!iscyborg(mymob)) return +/datum/hud/proc/update_robot_modules_display() + if(!isrobot(mymob)) return - var/mob/living/silicon/robot/R = mymob + var/mob/living/silicon/robot/r = mymob - var/mob/screenmob = viewer || R - - if(!R.module) + if(!r.client) return - if(!R.client) + if(!r.module) return - if(R.shown_robot_modules && screenmob.hud_used.hud_shown) + if(r.shown_robot_modules && hud_shown) //Modules display is shown - screenmob.client.screen += module_store_icon //"store" icon + r.client.screen += module_store_icon //"store" icon - if(!R.module.modules) + if(!r.module.modules) usr << "Selected module has no modules to select" return - if(!R.robot_modules_background) + if(!r.robot_modules_background) return - var/display_rows = Ceiling(length(R.module.get_inactive_modules()) / 8) - R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7" - screenmob.client.screen += R.robot_modules_background + var/display_rows = Ceiling(length(r.module.get_inactive_modules()) / 8) + r.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7" + r.client.screen += r.robot_modules_background var/x = -4 //Start at CENTER-4,SOUTH+1 var/y = 1 - for(var/atom/movable/A in R.module.get_inactive_modules()) + for(var/atom/movable/A in r.module.get_inactive_modules()) //Module is not currently active - screenmob.client.screen += A + r.client.screen += A if(x < 0) A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7" else A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7" A.layer = ABOVE_HUD_LAYER - A.plane = ABOVE_HUD_PLANE x++ if(x == 4) @@ -237,41 +206,37 @@ else //Modules display is hidden - screenmob.client.screen -= module_store_icon //"store" icon + r.client.screen -= module_store_icon //"store" icon - for(var/atom/A in R.module.get_inactive_modules()) + for(var/atom/A in r.module.get_inactive_modules()) //Module is not currently active - screenmob.client.screen -= A - R.shown_robot_modules = 0 - screenmob.client.screen -= R.robot_modules_background + r.client.screen -= A + r.shown_robot_modules = 0 + r.client.screen -= r.robot_modules_background /mob/living/silicon/robot/create_mob_hud() if(client && !hud_used) hud_used = new /datum/hud/robot(src) -/datum/hud/robot/persistent_inventory_update(mob/viewer) +/datum/hud/robot/persistant_inventory_update() if(!mymob) return var/mob/living/silicon/robot/R = mymob - - var/mob/screenmob = viewer || R - - if(screenmob.hud_used) - if(screenmob.hud_used.hud_shown) - for(var/i in 1 to R.held_items.len) - var/obj/item/I = R.held_items[i] - if(I) - switch(i) - if(1) - I.screen_loc = ui_inv1 - if(2) - I.screen_loc = ui_inv2 - if(3) - I.screen_loc = ui_inv3 - else - return - screenmob.client.screen += I - else - for(var/obj/item/I in R.held_items) - screenmob.client.screen -= I + if(hud_shown) + if(R.module_state_1) + R.module_state_1.screen_loc = ui_inv1 + R.client.screen += R.module_state_1 + if(R.module_state_2) + R.module_state_2.screen_loc = ui_inv2 + R.client.screen += R.module_state_2 + if(R.module_state_3) + R.module_state_3.screen_loc = ui_inv3 + R.client.screen += R.module_state_3 + else + if(R.module_state_1) + R.module_state_1.screen_loc = null + if(R.module_state_2) + R.module_state_2.screen_loc = null + if(R.module_state_3) + R.module_state_3.screen_loc = null \ No newline at end of file diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index adb707a60b..1a5148f681 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -10,15 +10,11 @@ name = "" icon = 'icons/mob/screen_gen.dmi' layer = ABOVE_HUD_LAYER - plane = ABOVE_HUD_PLANE - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + unacidable = 1 appearance_flags = APPEARANCE_UI var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. var/datum/hud/hud = null // A reference to the owner HUD, if any. -/obj/screen/take_damage() - return - /obj/screen/Destroy() master = null return ..() @@ -34,7 +30,6 @@ /obj/screen/swap_hand layer = HUD_LAYER - plane = HUD_PLANE name = "swap hand" /obj/screen/swap_hand/Click() @@ -59,31 +54,13 @@ /obj/screen/inventory/craft/Click() var/mob/living/M = usr - if(isobserver(usr)) - return M.OpenCraftingMenu() -/obj/screen/inventory/area_creator - name = "create new area" - icon = 'icons/mob/screen_midnight.dmi' - icon_state = "area_edit" - screen_loc = ui_building - -/obj/screen/inventory/area_creator/Click() - if(usr.incapacitated()) - return 1 - var/area/A = get_area(usr) - if(!A.outdoors) - usr << "There is already a defined structure here." - return 1 - create_area(usr) - /obj/screen/inventory var/slot_id // The indentifier for the slot. It has nothing to do with ID cards. var/icon_empty // Icon when empty. For now used only by humans. var/icon_full // Icon when contains an item. For now used only by humans. layer = HUD_LAYER - plane = HUD_PLANE /obj/screen/inventory/Click() // At this point in client Click() code we have passed the 1/10 sec check and little else @@ -96,7 +73,8 @@ if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech return 1 if(usr.attack_ui(slot_id)) - usr.update_inv_hands() + usr.update_inv_l_hand(0) + usr.update_inv_r_hand(0) return 1 /obj/screen/inventory/update_icon() @@ -113,15 +91,13 @@ var/image/active_overlay var/image/handcuff_overlay var/image/blocked_overlay - var/held_index = 0 /obj/screen/inventory/hand/update_icon() ..() - if(!active_overlay) active_overlay = image("icon"=icon, "icon_state"="hand_active") if(!handcuff_overlay) - var/state = (!(held_index % 2)) ? "markus" : "gabrielle" + var/state = (slot_id == slot_r_hand) ? "markus" : "gabrielle" handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"=state) if(!blocked_overlay) blocked_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"="blocked") @@ -133,14 +109,17 @@ var/mob/living/carbon/C = hud.mymob if(C.handcuffed) add_overlay(handcuff_overlay) - - if(held_index) - if(!C.has_hand_for_held_index(held_index)) + if(slot_id == slot_r_hand) + if(!C.has_right_hand()) + add_overlay(blocked_overlay) + else if(slot_id == slot_l_hand) + if(!C.has_left_hand()) add_overlay(blocked_overlay) - if(held_index == hud.mymob.active_hand_index) + if(slot_id == slot_l_hand && hud.mymob.hand) + add_overlay(active_overlay) + else if(slot_id == slot_r_hand && !hud.mymob.hand) add_overlay(active_overlay) - /obj/screen/inventory/hand/Click() // At this point in client Click() code we have passed the 1/10 sec check and little else @@ -154,7 +133,11 @@ if(ismob(usr)) var/mob/M = usr - M.swap_hand(held_index) + switch(name) + if("right hand", "r_hand") + M.activate_hand("r") + if("left hand", "l_hand") + M.activate_hand("l") return 1 /obj/screen/close @@ -172,7 +155,6 @@ icon = 'icons/mob/screen_midnight.dmi' icon_state = "act_drop" layer = HUD_LAYER - plane = HUD_PLANE /obj/screen/drop/Click() usr.drop_item_v() @@ -189,19 +171,19 @@ var/_y = text2num(params2list(params)["icon-y"]) if(_x<=16 && _y<=16) - usr.a_intent_change(INTENT_HARM) + usr.a_intent_change("harm") else if(_x<=16 && _y>=17) - usr.a_intent_change(INTENT_HELP) + usr.a_intent_change("help") else if(_x>=17 && _y<=16) - usr.a_intent_change(INTENT_GRAB) + usr.a_intent_change("grab") else if(_x>=17 && _y>=17) - usr.a_intent_change(INTENT_DISARM) + usr.a_intent_change("disarm") else - usr.a_intent_change(INTENT_HOTKEY_RIGHT) + usr.a_intent_change("right") /obj/screen/act_intent/alien icon = 'icons/mob/screen_alien.dmi' @@ -240,10 +222,12 @@ C << "You are not wearing an internals mask!" return - var/obj/item/I = C.is_holding_item_of_type(/obj/item/weapon/tank) - if(I) - C << "You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))]." - C.internal = I + if(istype(C.l_hand, /obj/item/weapon/tank)) + C << "You are now running on internals from the [C.l_hand] on your left hand." + C.internal = C.l_hand + else if(istype(C.r_hand, /obj/item/weapon/tank)) + C << "You are now running on internals from the [C.r_hand] on your right hand." + C.internal = C.r_hand else if(ishuman(C)) var/mob/living/carbon/human/H = C if(istype(H.s_store, /obj/item/weapon/tank)) @@ -277,19 +261,14 @@ icon_state = "running" /obj/screen/mov_intent/Click() - toggle(usr) - -/obj/screen/mov_intent/proc/toggle(mob/user) - if(isobserver(user)) - return - switch(user.m_intent) + switch(usr.m_intent) if("run") - user.m_intent = MOVE_INTENT_WALK + usr.m_intent = "walk" icon_state = "walking" if("walk") - user.m_intent = MOVE_INTENT_RUN + usr.m_intent = "run" icon_state = "running" - user.update_icons() + usr.update_icons() /obj/screen/pull name = "stop pulling" @@ -297,8 +276,6 @@ icon_state = "pull" /obj/screen/pull/Click() - if(isobserver(usr)) - return usr.stop_pulling() /obj/screen/pull/update_icon(mob/mymob) @@ -313,7 +290,6 @@ icon = 'icons/mob/screen_midnight.dmi' icon_state = "act_resist" layer = HUD_LAYER - plane = HUD_PLANE /obj/screen/resist/Click() if(isliving(usr)) @@ -331,7 +307,7 @@ if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech return 1 if(master) - var/obj/item/I = usr.get_active_held_item() + var/obj/item/I = usr.get_active_hand() if(I) master.attackby(I, usr, params) return 1 @@ -353,65 +329,55 @@ var/selecting = "chest" /obj/screen/zone_sel/Click(location, control,params) - if(isobserver(usr)) - return - var/list/PL = params2list(params) var/icon_x = text2num(PL["icon-x"]) var/icon_y = text2num(PL["icon-y"]) - var/choice + var/old_selecting = selecting //We're only going to update_icon() if there's been a change switch(icon_y) if(1 to 9) //Legs switch(icon_x) if(10 to 15) - choice = "r_leg" + selecting = "r_leg" if(17 to 22) - choice = "l_leg" + selecting = "l_leg" else return 1 if(10 to 13) //Hands and groin switch(icon_x) if(8 to 11) - choice = "r_arm" + selecting = "r_arm" if(12 to 20) - choice = "groin" + selecting = "groin" if(21 to 24) - choice = "l_arm" + selecting = "l_arm" else return 1 if(14 to 22) //Chest and arms to shoulders switch(icon_x) if(8 to 11) - choice = "r_arm" + selecting = "r_arm" if(12 to 20) - choice = "chest" + selecting = "chest" if(21 to 24) - choice = "l_arm" + selecting = "l_arm" else return 1 if(23 to 30) //Head, but we need to check for eye or mouth if(icon_x in 12 to 20) - choice = "head" + selecting = "head" switch(icon_y) if(23 to 24) if(icon_x in 15 to 17) - choice = "mouth" + selecting = "mouth" if(26) //Eyeline, eyes are on 15 and 17 if(icon_x in 14 to 18) - choice = "eyes" + selecting = "eyes" if(25 to 27) if(icon_x in 15 to 17) - choice = "eyes" + selecting = "eyes" - return set_selected_zone(choice, usr) - -/obj/screen/zone_sel/proc/set_selected_zone(choice, mob/user) - if(isobserver(user)) - return - - if(choice != selecting) - selecting = choice + if(old_selecting != selecting) update_icon(usr) return 1 @@ -438,7 +404,6 @@ blend_mode = BLEND_ADD screen_loc = "WEST,SOUTH to EAST,NORTH" layer = FLASH_LAYER - plane = FULLSCREEN_PLANE /obj/screen/damageoverlay icon = 'icons/mob/screen_full.dmi' @@ -448,7 +413,6 @@ screen_loc = "CENTER-7,CENTER-7" mouse_opacity = 0 layer = UI_DAMAGE_LAYER - plane = FULLSCREEN_PLANE /obj/screen/healths name = "health" @@ -491,17 +455,6 @@ screen_loc = ui_health mouse_opacity = 0 -/obj/screen/healths/clock - icon = 'icons/mob/actions.dmi' - icon_state = "bg_clock" - screen_loc = ui_health - mouse_opacity = 0 - -/obj/screen/healths/clock/gear - icon = 'icons/mob/clockwork_mobs.dmi' - icon_state = "bg_gear" - screen_loc = ui_internal - /obj/screen/healths/revenant name = "essence" icon = 'icons/mob/actions.dmi' @@ -512,140 +465,3 @@ /obj/screen/healthdoll name = "health doll" screen_loc = ui_healthdoll - - - -/obj/screen/wheel - name = "wheel" - layer = HUD_LAYER - plane = HUD_PLANE - icon_state = "" - screen_loc = null //if you make a new wheel, remember to give it a screen_loc - var/list/buttons_names = list() //list of the names for each button, its length is the amount of buttons. - var/toggled = 0 //wheel is hidden/shown - var/wheel_buttons_type //the type of buttons used with this wheel. - var/list/buttons_list = list() - -/obj/screen/wheel/New() - ..() - build_options() - - -//we create the buttons for the wheel and place them in a square spiral fashion. -/obj/screen/wheel/proc/build_options() - var/obj/screen/wheel_button/close_wheel/CW = new () - buttons_list += CW //the close option - CW.wheel = src - - var/list/offset_x_list = list() - var/list/offset_y_list = list() - var/num = 1 - var/N = 1 - var/M = 0 - var/sign = -1 - my_loop: - while(offset_y_list.len < buttons_names.len) - for(var/i=1, i<=num, i++) - offset_y_list += N - offset_x_list += M - if(offset_y_list.len == buttons_names.len) - break my_loop - if(N != 0) - N = 0 - M = -sign - else - N = sign - M = 0 - sign = -sign - num++ - - var/screenx = 8 - var/screeny = 8 - for(var/i = 1, i <= buttons_names.len, i++) - var/obj/screen/wheel_button/WB = new wheel_buttons_type() - WB.wheel = src - buttons_list += WB - screenx += offset_x_list[i] - screeny += offset_y_list[i] - WB.screen_loc = "[screenx], [screeny]" - set_button(WB, i) - -/obj/screen/wheel/proc/set_button(obj/screen/wheel_button/WB, button_number) - WB.name = buttons_names[button_number] - return - -/obj/screen/wheel/Destroy() - for(var/obj/screen/S in buttons_list) - qdel(S) - return ..() - -/obj/screen/wheel/Click() - if(world.time <= usr.next_move) - return - if(usr.stat) - return - if(isliving(usr)) - var/mob/living/L = usr - if(toggled) - L.client.screen -= buttons_list - else - L.client.screen |= buttons_list - toggled = !toggled - - -/obj/screen/wheel/talk - name = "talk wheel" - icon_state = "talk_wheel" - screen_loc = "11:6,2:-11" - wheel_buttons_type = /obj/screen/wheel_button/talk - buttons_names = list("help","hello","bye","stop","thanks","come","out", "yes", "no") - var/list/word_messages = list(list("Help!","Help me!"), list("Hello.", "Hi."), list("Bye.", "Goodbye."),\ - list("Stop!", "Halt!"), list("Thanks.", "Thanks!", "Thank you."), \ - list("Come.", "Follow me."), list("Out!", "Go away!", "Get out!"), \ - list("Yes.", "Affirmative."), list("No.", "Negative")) - -/obj/screen/wheel/talk/set_button(obj/screen/wheel_button/WB, button_number) - ..() - var/obj/screen/wheel_button/talk/T = WB //we already know what type the button is exactly. - T.icon_state = "talk_[T.name]" - T.word_messages = word_messages[button_number] - - -/obj/screen/wheel_button - name = "default wheel button" - screen_loc = "8,8" - layer = HUD_LAYER - plane = HUD_PLANE - mouse_opacity = 2 - var/obj/screen/wheel/wheel - -/obj/screen/wheel_button/Destroy() - wheel = null - return ..() - -/obj/screen/wheel_button/close_wheel - name = "close wheel" - icon_state = "x3" - -/obj/screen/wheel_button/close_wheel/Click() - if(isliving(usr)) - var/mob/living/L = usr - L.client.screen -= wheel.buttons_list - wheel.toggled = !wheel.toggled - - -/obj/screen/wheel_button/talk - name = "talk option" - icon_state = "talk_help" - var/talk_cooldown = 0 - var/list/word_messages = list() - -/obj/screen/wheel_button/talk/Click(location, control,params) - if(isliving(usr)) - var/mob/living/L = usr - if(L.stat) - return - - if(word_messages.len && talk_cooldown < world.time) - talk_cooldown = world.time + 10 - L.say(pick(word_messages)) diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm index 92a98e14c6..85ee9c4977 100644 --- a/code/_onclick/hud/swarmer.dm +++ b/code/_onclick/hud/swarmer.dm @@ -68,11 +68,11 @@ var/obj/screen/using using = new /obj/screen/swarmer/FabricateTrap() - using.screen_loc = ui_hand_position(2) + using.screen_loc = ui_rhand static_inventory += using using = new /obj/screen/swarmer/Barricade() - using.screen_loc = ui_hand_position(1) + using.screen_loc = ui_lhand static_inventory += using using = new /obj/screen/swarmer/Replicate() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 7014cc039f..e3fcdb7fb8 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -8,14 +8,11 @@ return /obj/attackby(obj/item/I, mob/living/user, params) - if(unique_rename && istype(I, /obj/item/weapon/pen)) - rewrite(user) - else - return I.attack_obj(src, user) + return I.attack_obj(src, user) /mob/living/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) - if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it? + if(user.a_intent == "harm" && stat == DEAD && butcher_results) //can we butcher it? var/sharpness = I.is_sharp() if(sharpness) user << "You begin to butcher [src]..." @@ -37,7 +34,6 @@ user.lastattacked = M M.lastattacker = user - user.do_attack_animation(M) M.attacked_by(src, user) add_logs(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])") @@ -52,33 +48,29 @@ user.do_attack_animation(O) O.attacked_by(src, user) + + /atom/movable/proc/attacked_by() return /obj/attacked_by(obj/item/I, mob/living/user) if(I.force) - visible_message("[user] has hit [src] with [I]!", null, null, COMBAT_MESSAGE_RANGE) - //only witnesses close by and the victim see a hit message. - take_damage(I.force, I.damtype, "melee", 1) + user.visible_message("[user] has hit [src] with [I]!", "You hit [src] with [I]!") /mob/living/attacked_by(obj/item/I, mob/living/user) - send_item_attack_message(I, user) - if(I.force) - apply_damage(I.force, I.damtype) - if(I.damtype == BRUTE) - if(prob(33)) - I.add_mob_blood(src) - var/turf/location = get_turf(src) - add_splatter_floor(location) - if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood - user.add_mob_blood(src) - return TRUE //successful attack + if(user != src) + user.do_attack_animation(src) + if(send_item_attack_message(I, user)) + if(apply_damage(I.force, I.damtype)) + if(I.damtype == BRUTE) + if(prob(33)) + I.add_mob_blood(src) + var/turf/location = get_turf(src) + add_splatter_floor(location) + if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood + user.add_mob_blood(src) + return TRUE -/mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user) - if(I.force < force_threshold || I.damtype == STAMINA) - playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1) - else - return ..() // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person. // Click parameters is the params string from byond Click() code, see that documentation. @@ -95,17 +87,27 @@ /mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area) var/message_verb = "attacked" - if(I.attack_verb && I.attack_verb.len) + if(I.attack_verb.len) message_verb = "[pick(I.attack_verb)]" else if(!I.force) - return + return 0 var/message_hit_area = "" if(hit_area) message_hit_area = " in the [hit_area]" + var/attack_message = "[src] has been [message_verb][message_hit_area] with [I]." if(user in viewers(src, null)) attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" - visible_message("[attack_message]", \ - "[attack_message]", null, COMBAT_MESSAGE_RANGE) + visible_message("[attack_message]", + "[attack_message]") return 1 +/mob/living/simple_animal/send_item_attack_message(obj/item/I, mob/living/user, hit_area) + if(!I.force) + user.visible_message("[user] gently taps [src] with [I].",\ + "This weapon is ineffective, it does no damage!") + else if(I.force < force_threshold || I.damtype == STAMINA) + visible_message("[I] bounces harmlessly off of [src].",\ + "[I] bounces harmlessly off of [src]!") + else + return ..() \ No newline at end of file diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index c0785b34a7..e452c91779 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -15,7 +15,6 @@ // Otherwise jump else if(A.loc) loc = get_turf(A) - update_parallax_contents() /mob/dead/observer/ClickOn(var/atom/A, var/params) if(client.click_intercept) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 6dfcb7f80a..4d0ff1f69e 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -20,7 +20,7 @@ var/override = 0 for(var/datum/mutation/human/HM in dna.mutations) - override += HM.on_attack_hand(src, A, proximity) + override += HM.on_attack_hand(src, A) if(override) return @@ -50,8 +50,9 @@ for(var/datum/mutation/human/HM in dna.mutations) HM.on_ranged_attack(src, A) - if(isturf(A) && get_dist(src,A) <= 1) - src.Move_Pulled(A) + var/turf/T = A + if(istype(T) && get_dist(src,T) <= 1) + src.Move_Pulled(T) /* Animals & All Unspecified @@ -59,6 +60,10 @@ /mob/living/UnarmedAttack(atom/A) A.attack_animal(src) +/mob/living/simple_animal/hostile/UnarmedAttack(atom/A) + target = A + AttackingTarget() + /atom/proc/attack_animal(mob/user) return /mob/living/RestrainedClickOn(atom/A) @@ -82,7 +87,7 @@ /mob/living/carbon/monkey/RestrainedClickOn(atom/A) if(..()) return - if(a_intent != INTENT_HARM || !ismob(A)) + if(a_intent != "harm" || !ismob(A)) return if(is_muzzled()) return @@ -110,7 +115,7 @@ */ /mob/living/carbon/alien/UnarmedAttack(atom/A) A.attack_alien(src) -/atom/proc/attack_alien(mob/living/carbon/alien/user) +/atom/proc/attack_alien(mob/user) attack_paw(user) return /mob/living/carbon/alien/RestrainedClickOn(atom/A) @@ -134,68 +139,6 @@ /mob/living/simple_animal/slime/RestrainedClickOn(atom/A) return - -/* - Drones -*/ -/mob/living/simple_animal/drone/UnarmedAttack(atom/A) - A.attack_drone(src) - -/atom/proc/attack_drone(mob/living/simple_animal/drone/user) - attack_hand(user) //defaults to attack_hand. Override it when you don't want drones to do same stuff as humans. - -/mob/living/simple_animal/slime/RestrainedClickOn(atom/A) - return - - -/* - True Devil -*/ - -/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity) - A.attack_hand(src) - -/* - Brain -*/ - -/mob/living/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default - return - - -/* - pAI -*/ - -/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default - return - - -/* - Simple animals -*/ - -/mob/living/simple_animal/UnarmedAttack(atom/A, proximity) - if(!dextrous) - return ..() - if(!ismob(A)) - A.attack_hand(src) - update_inv_hands() - - -/* - Hostile animals -*/ - -/mob/living/simple_animal/hostile/UnarmedAttack(atom/A) - target = A - if(dextrous && !is_type_in_typecache(A, environment_target_typecache) && !ismob(A)) - ..() - else - AttackingTarget() - - - /* New Players: Have no reason to click on anything at all. diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 8aa85620da..4fc1fd2851 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -1,13 +1,11 @@ /* Telekinesis - This needs more thinking out, but I might as well. */ var/const/tk_maxrange = 15 /* Telekinetic attack: - By default, emulate the user's unarmed attack */ /atom/proc/attack_tk(mob/user) @@ -19,7 +17,6 @@ var/const/tk_maxrange = 15 /* This is similar to item attack_self, but applies to anything that you can grab with a telekinetic grab. - It is used for manipulating things at range, for example, opening and closing closets. There are not a lot of defaults at this time, add more where appropriate. */ @@ -57,7 +54,6 @@ var/const/tk_maxrange = 15 /* TK Grab Item (the workhorse of old TK) - * If you have not grabbed something, do a normal tk attack * If you have something, throw it at the target. If it is already adjacent, do a normal attackby() * If you click what you are holding, or attack_self(), do an attack_self_tk() on it. @@ -70,9 +66,8 @@ var/const/tk_maxrange = 15 icon_state = "2" flags = NOBLUDGEON | ABSTRACT | DROPDEL //item_state = null - w_class = WEIGHT_CLASS_GIGANTIC + w_class = 10 layer = ABOVE_HUD_LAYER - plane = ABOVE_HUD_PLANE var/last_throw = 0 var/atom/movable/focus = null @@ -87,7 +82,7 @@ var/const/tk_maxrange = 15 //stops TK grabs being equipped anywhere but into hands /obj/item/tk_grab/equipped(mob/user, slot) - if(slot == slot_hands) + if( (slot == slot_l_hand) || (slot== slot_r_hand) ) return qdel(src) return @@ -190,7 +185,7 @@ var/const/tk_maxrange = 15 return /obj/item/tk_grab/suicide_act(mob/user) - user.visible_message("[user] is using [user.p_their()] telekinesis to choke [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is using \his telekinesis to choke \himself! It looks like \he's trying to commit suicide.") return (OXYLOSS) /*Not quite done likely needs to use something thats not get_step_to @@ -218,5 +213,4 @@ var/const/tk_maxrange = 15 var/X = source:x var/Y = source:y var/Z = source:z - -*/ +*/ \ No newline at end of file diff --git a/code/citadel/_helpers.dm b/code/citadel/_helpers.dm index e2c3f39322..e898f30b65 100644 --- a/code/citadel/_helpers.dm +++ b/code/citadel/_helpers.dm @@ -22,7 +22,7 @@ var/const/SIZEPLAY_HUGE=5 /proc/get_matrix_smallest() var/matrix/mtrx=new() return mtrx.Scale(0.65) -/* omited for quick error resolution while porting -Pooj + proc/get_racelist(var/mob/user)//This proc returns a list of species that 'user' has available to them. It searches the list of ckeys attached to the 'whitelist' var for a species and also checks if they're an admin. for(var/spath in subtypesof(/datum/species)) var/datum/species/S = new spath() @@ -32,4 +32,3 @@ proc/get_racelist(var/mob/user)//This proc returns a list of species that 'user' else if(!S.whitelisted && S.roundstart) //Normal roundstart species will be handled here. whitelisted_species_list[S.id] = S.type return whitelisted_species_list -*/ \ No newline at end of file diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 0b0b344a2c..1ff1e29ba5 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -1,4 +1,4 @@ -//Configuraton defines //TODO: Move all yes/no switches into bitflags +f//Configuraton defines //TODO: Move all yes/no switches into bitflags //Used by jobs_have_maint_access #define ASSISTANTS_HAVE_MAINT_ACCESS 1 @@ -18,7 +18,6 @@ var/server_suffix = 0 // generate numeric suffix based on server port var/lobby_countdown = 120 // In between round countdown. var/round_end_countdown = 25 // Post round murder death kill countdown - var/hub = 0 var/log_ooc = 0 // log OOC channel var/log_access = 0 // log login/logout @@ -34,7 +33,6 @@ var/log_adminchat = 0 // log admin chat messages var/log_pda = 0 // log pda messages var/log_hrefs = 0 // log all links clicked in-game. Could be used for debugging and tracking down exploits - var/log_twitter = 0 // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. var/log_world_topic = 0 // log all world.Topic() calls var/sql_enabled = 0 // for sql switching var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour @@ -72,11 +70,6 @@ var/forbid_singulo_possession = 0 var/useircbot = 0 - var/check_randomizer = 0 - - var/allow_panic_bunker_bounce = 0 //Send new players somewhere else - var/panic_server_name = "somewhere else" - //IP Intel vars var/ipintel_email var/ipintel_rating_bad = 1 @@ -87,7 +80,6 @@ var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database - var/use_account_age_for_jobs = 0 //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected. var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt //Population cap vars @@ -104,8 +96,6 @@ var/list/modes = list() // allowed modes var/list/votable_modes = list() // votable modes var/list/probabilities = list() // relative probability of each mode - var/list/min_pop = list() // overrides for acceptible player counts in a mode - var/list/max_pop = list() var/humans_need_surnames = 0 var/allow_ai = 0 // allow ai job @@ -147,6 +137,9 @@ var/alert_desc_red_downto = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." var/alert_desc_delta = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." + var/health_threshold_crit = 0 + var/health_threshold_dead = -100 + var/revival_pod_plants = 1 var/revival_cloning = 1 var/revival_brain_life = -1 @@ -174,8 +167,6 @@ var/silent_ai = 0 var/silent_borg = 0 - var/damage_multiplier = 1 //Modifier for damage to all mobs. Impacts healing as well. - var/allowwebclient = 0 var/webclientmembersonly = 0 @@ -183,9 +174,6 @@ var/default_laws = 0 //Controls what laws the AI spawns with. var/silicon_max_law_amount = 12 - var/list/lawids = list() - - var/list/law_weights = list() var/assistant_cap = -1 @@ -194,7 +182,6 @@ var/grey_assistants = 0 var/lavaland_budget = 60 - var/space_budget = 16 var/aggressive_changelog = 0 @@ -226,7 +213,6 @@ var/client_error_message = "Your version of byond is too old, may have issues, and is blocked from accessing this server." var/cross_name = "Other server" - var/showircname = 0 /datum/configuration/New() var/list/L = subtypesof(/datum/game_mode) @@ -274,16 +260,12 @@ if(type == "config") switch(name) - if("hub") - config.hub = 1 if("admin_legacy_system") config.admin_legacy_system = 1 if("ban_legacy_system") config.ban_legacy_system = 1 if("use_age_restriction_for_jobs") config.use_age_restriction_for_jobs = 1 - if("use_account_age_for_jobs") - config.use_account_age_for_jobs = 1 if("lobby_countdown") config.lobby_countdown = text2num(value) if("round_end_countdown") @@ -316,8 +298,6 @@ config.log_pda = 1 if("log_hrefs") config.log_hrefs = 1 - if("log_twitter") - config.log_twitter = 1 if("log_world_topic") config.log_world_topic = 1 if("allow_admin_ooccolor") @@ -361,7 +341,7 @@ if("guest_ban") guests_allowed = 0 if("usewhitelist") - config.usewhitelist = TRUE + config.usewhitelist = 1 if("allow_metadata") config.allow_Metadata = 1 if("kick_inactive") @@ -396,18 +376,6 @@ global.cross_allowed = 1 if("cross_comms_name") cross_name = value - if("panic_server_name") - panic_server_name = value - if("panic_server_address") - global.panic_address = value - if(value != "byond:\\address:port") - allow_panic_bunker_bounce = 1 - if("medal_hub_address") - global.medal_hub = value - if("medal_hub_password") - global.medal_pass = value - if("show_irc_name") - config.showircname = 1 if("see_own_notes") config.see_own_notes = 1 if("soft_popcap") @@ -428,8 +396,6 @@ config.notify_new_player_age = text2num(value) if("irc_first_connection_alert") config.irc_first_connection_alert = 1 - if("check_randomizer") - config.check_randomizer = 1 if("ipintel_email") if (value != "ch@nge.me") config.ipintel_email = value @@ -482,8 +448,10 @@ else if(type == "game_options") switch(name) - if("damage_multiplier") - config.damage_multiplier = text2num(value) + if("health_threshold_crit") + config.health_threshold_crit = text2num(value) + if("health_threshold_dead") + config.health_threshold_dead = text2num(value) if("revival_pod_plants") config.revival_pod_plants = text2num(value) if("revival_cloning") @@ -552,34 +520,6 @@ config.midround_antag_time_check = text2num(value) if("midround_antag_life_check") config.midround_antag_life_check = text2num(value) - if("min_pop") - var/pop_pos = findtext(value, " ") - var/mode_name = null - var/mode_value = null - - if(pop_pos) - mode_name = lowertext(copytext(value, 1, pop_pos)) - mode_value = copytext(value, pop_pos + 1) - if(mode_name in config.modes) - config.min_pop[mode_name] = text2num(mode_value) - else - diary << "Unknown minimum population configuration definition: [mode_name]." - else - diary << "Incorrect minimum population configuration definition: [mode_name] [mode_value]." - if("max_pop") - var/pop_pos = findtext(value, " ") - var/mode_name = null - var/mode_value = null - - if(pop_pos) - mode_name = lowertext(copytext(value, 1, pop_pos)) - mode_value = copytext(value, pop_pos + 1) - if(mode_name in config.modes) - config.max_pop[mode_name] = text2num(mode_value) - else - diary << "Unknown maximum population configuration definition: [mode_name]." - else - diary << "Incorrect maximum population configuration definition: [mode_name] [mode_value]." if("shuttle_refuel_delay") config.shuttle_refuel_delay = text2num(value) if("show_game_type_odds") @@ -649,19 +589,6 @@ config.sandbox_autoclose = 1 if("default_laws") config.default_laws = text2num(value) - if("random_laws") - var/law_id = lowertext(value) - lawids += law_id - if("law_weight") - // Value is in the form "LAWID,NUMBER" - var/list/L = splittext(value, ",") - if(L.len != 2) - diary << "Invalid LAW_WEIGHT: " + t - continue - var/lawid = L[1] - var/weight = text2num(L[2]) - law_weights[lawid] = weight - if("silicon_max_law_amount") config.silicon_max_law_amount = text2num(value) if("join_with_mutant_race") @@ -682,8 +609,6 @@ config.grey_assistants = 1 if("lavaland_budget") config.lavaland_budget = text2num(value) - if("space_budget") - config.space_budget = text2num(value) if("no_summon_guns") config.no_summon_guns = 1 if("no_summon_magic") @@ -828,10 +753,6 @@ if(probabilities[M.config_tag]<=0) qdel(M) continue - if(min_pop[M.config_tag]) - M.required_players = min_pop[M.config_tag] - if(max_pop[M.config_tag]) - M.maximum_players = max_pop[M.config_tag] if(M.can_start()) runnable_modes[M] = probabilities[M.config_tag] //world << "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]" @@ -847,13 +768,7 @@ if(probabilities[M.config_tag]<=0) qdel(M) continue - if(min_pop[M.config_tag]) - M.required_players = min_pop[M.config_tag] - if(max_pop[M.config_tag]) - M.maximum_players = max_pop[M.config_tag] if(M.required_players <= crew) - if(M.maximum_players >= 0 && M.maximum_players < crew) - continue runnable_modes[M] = probabilities[M.config_tag] return runnable_modes diff --git a/code/controllers/master.dm b/code/controllers/master.dm index b18b723f97..6c0658aa2e 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -35,8 +35,6 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING var/init_time var/tickdrift = 0 - var/sleep_delta - var/make_runtime = 0 // Has round started? (So we know what subsystems to run) @@ -67,11 +65,6 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING // Tell qdel() to Del() this object. return QDEL_HINT_HARDDEL_NOW -/datum/controller/master/proc/Shutdown() - processing = FALSE - for(var/datum/subsystem/ss in subsystems) - ss.Shutdown() - // Returns 1 if we created a new mc, 0 if we couldn't due to a recent restart, // -1 if we encountered a runtime trying to recreate it /proc/Recreate_MC() @@ -172,8 +165,8 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING message_admins("MC crashed or runtimed, restarting") var/rtn2 = Recreate_MC() if (rtn2 <= 0) - log_game("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") - message_admins("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") + log_game("Failed to recreate MC (Error code: [rtn2]), its up to the failsafe now") + message_admins("Failed to recreate MC (Error code: [rtn2]), its up to the failsafe now") Failsafe.defcon = 2 // Main loop. @@ -287,7 +280,6 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING iteration++ last_run = world.time - src.sleep_delta = MC_AVERAGE_FAST(src.sleep_delta, sleep_delta) sleep(world.tick_lag * (processing + sleep_delta)) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 3fb7e75ab7..8cd011932b 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -37,10 +37,6 @@ // Used to initialize the subsystem BEFORE the map has loaded /datum/subsystem/New() -//cleanup actions -/datum/subsystem/proc/Shutdown() - return - //previously, this would have been named 'process()' but that name is used everywhere for different things! //fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds. //fire(), and the procs it calls, SHOULD NOT HAVE ANY SLEEP OPERATIONS in them! @@ -144,7 +140,7 @@ statclick = new/obj/effect/statclick/debug("Initializing...", src) if(can_fire) - msg = "[round(cost,1)]ms|[round(tick_usage,1)]%|[round(ticks,0.1)]\t[msg]" + msg = "[round(cost*ticks,1)]ms|[round(tick_usage,1)]%|[round(ticks,0.1)]\t[msg]" else msg = "OFFLINE\t[msg]" @@ -161,12 +157,7 @@ /datum/subsystem/proc/Recover() //this is so the subsystem doesn't rapid fire to make up missed ticks causing more lag -/datum/subsystem/vv_edit_var(var_name, var_value) - switch (var_name) - if ("can_fire") - if (var_value) - next_fire = world.time + wait - if ("queued_priority") //editing this breaks things. - return 0 - . = ..() - +/datum/subsystem/on_varedit(edited_var) + if (edited_var == "can_fire" && can_fire) + next_fire = world.time + wait + ..() diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm deleted file mode 100644 index 23b671bf71..0000000000 --- a/code/controllers/subsystem/acid.dm +++ /dev/null @@ -1,42 +0,0 @@ -var/datum/subsystem/acid/SSacid - -/datum/subsystem/acid - name = "Acid" - priority = 40 - flags = SS_NO_INIT|SS_BACKGROUND - - var/list/currentrun = list() - var/list/processing = list() - -/datum/subsystem/acid/New() - NEW_SS_GLOBAL(SSacid) - - -/datum/subsystem/acid/stat_entry() - ..("P:[processing.len]") - - -/datum/subsystem/acid/fire(resumed = 0) - if (!resumed) - src.currentrun = processing.Copy() - - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - - while (currentrun.len) - var/obj/O = currentrun[currentrun.len] - currentrun.len-- - if (!O || qdeleted(O)) - processing -= O - if (MC_TICK_CHECK) - return - continue - - if(O.acid_level && O.acid_processing()) - else - O.overlays -= acid_overlay - O.priority_overlays -= acid_overlay - processing -= O - - if (MC_TICK_CHECK) - return diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm deleted file mode 100644 index 0b5c7b0085..0000000000 --- a/code/controllers/subsystem/augury.dm +++ /dev/null @@ -1,84 +0,0 @@ -var/datum/subsystem/augury/SSaugury - -/datum/subsystem/augury - name = "Augury" - flags = SS_NO_INIT - - var/list/watchers = list() - var/list/doombringers = list() - - var/list/observers_given_action = list() - -/datum/subsystem/augury/New() - NEW_SS_GLOBAL(SSaugury) - -/datum/subsystem/augury/stat_entry(msg) - ..("W:[watchers.len]|D:[doombringers.len]") - -/datum/subsystem/augury/proc/register_doom(atom/A, severity) - doombringers[A] = severity - -/datum/subsystem/augury/fire() - var/biggest_doom = null - var/biggest_threat = null - - for(var/d in doombringers) - if(!d || qdeleted(d)) - doombringers -= d - continue - var/threat = doombringers[d] - if((biggest_threat == null) || (biggest_threat < threat)) - biggest_doom = d - biggest_threat = threat - - if(doombringers.len) - for(var/i in player_list) - if(isobserver(i) && (!(observers_given_action[i]))) - var/datum/action/innate/augury/A = new - A.Grant(i) - observers_given_action[i] = TRUE - else - for(var/i in observers_given_action) - if(observers_given_action[i] && isobserver(i)) - var/mob/dead/observer/O = i - for(var/datum/action/innate/augury/A in O.actions) - qdel(A) - observers_given_action -= i - - for(var/w in watchers) - if(!w) - watchers -= w - continue - var/mob/dead/observer/O = w - if(biggest_doom && (!O.orbiting || O.orbiting.orbiting != biggest_doom)) - O.ManualFollow(biggest_doom) - -/datum/action/innate/augury - name = "Auto Follow Debris" - icon_icon = 'icons/obj/meteor.dmi' - button_icon_state = "flaming" - background_icon_state = ACTION_BUTTON_DEFAULT_BACKGROUND - -/datum/action/innate/augury/Destroy() - if(owner) - SSaugury.watchers -= owner - return ..() - -/datum/action/innate/augury/Activate() - SSaugury.watchers += owner - owner << "You are now auto-following debris." - active = TRUE - UpdateButtonIcon() - -/datum/action/innate/augury/Deactivate() - SSaugury.watchers -= owner - owner << "You are no longer auto-following debris." - active = FALSE - UpdateButtonIcon() - -/datum/action/innate/augury/UpdateButtonIcon() - ..() - if(active) - button.icon_state = "template_active" - else - button.icon_state = "template" diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 718229793f..50e1521518 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -110,8 +110,8 @@ var/datum/subsystem/events/SSevent /datum/round_event/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in! var/list/safe_areas = list( - /area/ai_monitored/turret_protected/ai, - /area/ai_monitored/turret_protected/ai_upload, + /area/turret_protected/ai, + /area/turret_protected/ai_upload, /area/engine, /area/solar, /area/holodeck, diff --git a/code/controllers/subsystem/fastprocess.dm b/code/controllers/subsystem/fastprocess.dm new file mode 100644 index 0000000000..dfe0da21bc --- /dev/null +++ b/code/controllers/subsystem/fastprocess.dm @@ -0,0 +1,33 @@ +var/datum/subsystem/fastprocess/SSfastprocess + +/datum/subsystem/fastprocess + name = "Fast Process" + priority = 25 + flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT + wait = 2 + + var/list/processing = list() + var/list/currentrun = list() + +/datum/subsystem/fastprocess/New() + NEW_SS_GLOBAL(SSfastprocess) + +/datum/subsystem/fastprocess/stat_entry() + ..("FP:[processing.len]") + + +/datum/subsystem/fastprocess/fire(resumed = 0) + if (!resumed) + src.currentrun = processing.Copy() + //cache for sanic speed (lists are references anyways) + var/list/currentrun = src.currentrun + + while(currentrun.len) + var/datum/thing = currentrun[currentrun.len] + currentrun.len-- + if(thing) + thing.process(wait) + else + SSfastprocess.processing -= thing + if (MC_TICK_CHECK) + return diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fire_burning.dm deleted file mode 100644 index 2ace744430..0000000000 --- a/code/controllers/subsystem/fire_burning.dm +++ /dev/null @@ -1,42 +0,0 @@ -var/datum/subsystem/fire_burning/SSfire_burning - -/datum/subsystem/fire_burning - name = "Fire Burning" - priority = 40 - flags = SS_NO_INIT|SS_BACKGROUND - - var/list/currentrun = list() - var/list/processing = list() - -/datum/subsystem/fire_burning/New() - NEW_SS_GLOBAL(SSfire_burning) - - -/datum/subsystem/fire_burning/stat_entry() - ..("P:[processing.len]") - - -/datum/subsystem/fire_burning/fire(resumed = 0) - if (!resumed) - src.currentrun = processing.Copy() - - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - - while(currentrun.len) - var/obj/O = currentrun[currentrun.len] - currentrun.len-- - if (!O || qdeleted(O)) - processing -= O - if (MC_TICK_CHECK) - return - continue - - if(O.resistance_flags & ON_FIRE) - O.take_damage(20, BURN, "fire", 0) - else - processing -= O - - if (MC_TICK_CHECK) - return - diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 73de5173c6..819c2e4ec1 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -70,7 +70,7 @@ var/datum/subsystem/garbage_collector/SSgarbage Queue(ref) tobequeued.Cut(1, 2) -/datum/subsystem/garbage_collector/proc/HandleQueue() +/datum/subsystem/garbage_collector/proc/HandleQueue(time_to_stop) delslasttick = 0 gcedlasttick = 0 var/time_to_kill = world.time - collection_timeout // Anything qdel() but not GC'd BEFORE this time needs to be manually del() @@ -121,7 +121,7 @@ var/datum/subsystem/garbage_collector/SSgarbage ++totalgcs /datum/subsystem/garbage_collector/proc/QueueForQueuing(datum/A) - if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + if (istype(A) && isnull(A.gc_destroyed)) tobequeued += A A.gc_destroyed = GC_QUEUED_FOR_QUEUING @@ -142,7 +142,7 @@ var/datum/subsystem/garbage_collector/SSgarbage queue[refid] = gctime /datum/subsystem/garbage_collector/proc/HardQueue(datum/A) - if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + if (istype(A) && isnull(A.gc_destroyed)) tobequeued += A A.gc_destroyed = GC_QUEUED_FOR_HARD_DEL @@ -158,12 +158,11 @@ var/datum/subsystem/garbage_collector/SSgarbage if(!D) return #ifdef TESTING - SSgarbage.qdel_list += "[D.type]" + SSgarbage.qdel_list += "[A.type]" #endif if(!istype(D)) del(D) else if(isnull(D.gc_destroyed)) - D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED var/hint = D.Destroy(force) // Let our friend know they're about to get fucked up. if(!D) return @@ -172,7 +171,6 @@ var/datum/subsystem/garbage_collector/SSgarbage SSgarbage.QueueForQueuing(D) if (QDEL_HINT_LETMELIVE, QDEL_HINT_IWILLGC) //qdel should let the object live after calling destory. if(!force) - D.gc_destroyed = null //clear the gc variable (important!) return // Returning LETMELIVE after being told to force destroy // indicates the objects Destroy() does not respect force @@ -193,15 +191,13 @@ var/datum/subsystem/garbage_collector/SSgarbage if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion. SSgarbage.QueueForQueuing(D) #ifdef TESTING - D.find_references() + A.find_references() #endif else if(!SSgarbage.noqdelhint["[D.type]"]) SSgarbage.noqdelhint["[D.type]"] = "[D.type]" testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.") SSgarbage.QueueForQueuing(D) - else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) - CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic") // Returns 1 if the object has been queued for deletion. /proc/qdeleted(datum/D) @@ -211,14 +207,6 @@ var/datum/subsystem/garbage_collector/SSgarbage return TRUE return FALSE -// Returns true if the object's destroy has been called (set just before it is called) -/proc/qdestroying(datum/D) - if(!istype(D)) - return FALSE - if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) - return TRUE - return FALSE - // Default implementation of clean-up code. // This should be overridden to remove all references pointing to the object being destroyed. // Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE. @@ -229,18 +217,15 @@ var/datum/subsystem/garbage_collector/SSgarbage /datum/var/gc_destroyed //Time when this object was destroyed. #ifdef TESTING +/client/var/running_find_references /datum/var/running_find_references -/datum/verb/find_refs() +/datum/verb/find_references() set category = "Debug" set name = "Find References" set background = 1 set src in world - find_references(FALSE) - -/datum/proc/find_references(skip_alert) - set background = 1 running_find_references = type if(usr && usr.client) if(usr.client.running_find_references) @@ -252,10 +237,9 @@ var/datum/subsystem/garbage_collector/SSgarbage SSgarbage.next_fire = world.time + world.tick_lag return - if(!skip_alert) - if(alert("Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", "Yes", "No") == "No") - running_find_references = null - return + if(alert("Running this will create a lot of lag until it finishes. You can cancel it by running it again. Would you like to begin the search?", "Find References", "Yes", "No") == "No") + running_find_references = null + return //this keeps the garbage collector from failing to collect objects being searched for in here SSgarbage.can_fire = 0 @@ -264,7 +248,13 @@ var/datum/subsystem/garbage_collector/SSgarbage usr.client.running_find_references = type testing("Beginning search for references to a [type].") - for(var/datum/thing in world) + var/list/things = list() + for(var/client/thing) + things |= thing + for(var/datum/thing) + things |= thing + testing("Collected list of things in search for references to a [type]. ([things.len] Thing\s)") + for(var/datum/thing in things) if(usr && usr.client && !usr.client.running_find_references) return for(var/varname in thing.vars) var/variable = thing.vars[varname] @@ -300,7 +290,7 @@ var/datum/subsystem/garbage_collector/SSgarbage qdel(src) if(!running_find_references) - find_references(TRUE) + find_references() /client/verb/show_qdeleted() set category = "Debug" diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index beb91c3a8e..2b19a0dbf7 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -16,7 +16,7 @@ var/datum/subsystem/icon_smooth/SSicon_smooth while(smooth_queue.len) var/atom/A = smooth_queue[smooth_queue.len] smooth_queue.len-- - smooth_icon(A) + ss_smooth_icon(A) if (MC_TICK_CHECK) return if (!smooth_queue.len) @@ -25,12 +25,8 @@ var/datum/subsystem/icon_smooth/SSicon_smooth /datum/subsystem/icon_smooth/Initialize() smooth_zlevel(1,TRUE) smooth_zlevel(2,TRUE) - var/queue = smooth_queue - smooth_queue = list() - for(var/V in queue) + for(var/V in smooth_queue) var/atom/A = V - if(!A || A.z <= 2) - continue - smooth_icon(A) - + if(A.z == 1 || A.z == 2) + smooth_queue -= A ..() \ No newline at end of file diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 8b0968bec1..f4925cba6d 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -328,7 +328,7 @@ var/datum/subsystem/job/SSjob for(var/mob/new_player/player in unassigned) if(PopcapReached()) RejectPlayer(player) - else if(player.client.prefs.joblessrole == BERANDOMJOB) + else if(player.client.prefs.userandomjob) GiveRandomJob(player) Debug("DO, Standard Check end") @@ -339,15 +339,8 @@ var/datum/subsystem/job/SSjob for(var/mob/new_player/player in unassigned) if(PopcapReached()) RejectPlayer(player) - if(player.client.prefs.joblessrole == BEASSISTANT) - Debug("AC2 Assistant located, Player: [player]") - AssignRole(player, "Assistant") - else // For those who don't want to play if their preference were filled, back you go. - RejectPlayer(player) - - for(var/mob/new_player/player in unassigned) //Players that wanted to back out but couldn't because they're antags (can you feel the edge case?) - GiveRandomJob(player) - + Debug("AC2 Assistant located, Player: [player]") + AssignRole(player, "Assistant") return 1 //Gives the player the stuff he should have with his rank @@ -382,7 +375,7 @@ var/datum/subsystem/job/SSjob if(clear) S = T continue - if(istype(S, /obj/effect/landmark) && isturf(S.loc)) + if(istype(S, /obj/effect/landmark) && istype(S.loc, /turf)) H.loc = S.loc if(H.mind) @@ -401,7 +394,7 @@ var/datum/subsystem/job/SSjob H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." if(config.minimal_access_threshold) H << "As this station was initially staffed with a [config.jobs_have_minimal_access ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card." - return H + return 1 /datum/subsystem/job/proc/setup_officer_positions() @@ -477,8 +470,7 @@ var/datum/subsystem/job/SSjob /datum/subsystem/job/proc/RejectPlayer(mob/new_player/player) if(player.mind && player.mind.special_role) return - if(PopcapReached()) - Debug("Popcap overflow Check observer located, Player: [player]") + Debug("Popcap overflow Check observer located, Player: [player]") player << "You have failed to qualify for any job you desired." unassigned -= player player.ready = 0 diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 388ca3e231..2eac9a1021 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -1,116 +1,65 @@ + var/datum/subsystem/lighting/SSlighting -#define SSLIGHTING_LIGHTS 1 -#define SSLIGHTING_TURFS 2 +/var/list/lighting_update_lights = list() // List of lighting sources queued for update. +/var/list/lighting_update_corners = list() // List of lighting corners queued for update. +/var/list/lighting_update_overlays = list() // List of lighting overlays queued for update. + +/var/list/lighting_update_lights_old = list() // List of lighting sources currently being updated. +/var/list/lighting_update_corners_old = list() // List of lighting corners currently being updated. +/var/list/lighting_update_overlays_old = list() // List of lighting overlays currently being updated. /datum/subsystem/lighting - name = "Lighting" + name = "lighting" init_order = 1 - wait = 1 - flags = SS_POST_FIRE_TIMING - priority = 40 + wait = 2 display_order = 5 - - var/list/changed_lights = list() //list of all datum/light_source that need updating - var/changed_lights_workload = 0 //stats on the largest number of lights (max changed_lights.len) - var/list/changed_turfs = list() //list of all turfs which may have a different light level - var/changed_turfs_workload = 0 //stats on the largest number of turfs changed (max changed_turfs.len) + priority = 40 + flags = SS_POST_FIRE_TIMING /datum/subsystem/lighting/New() NEW_SS_GLOBAL(SSlighting) return ..() - -/datum/subsystem/lighting/stat_entry() - ..("L:[round(changed_lights_workload,1)]|T:[round(changed_turfs_workload,1)]") - - -//Workhorse of lighting. It cycles through each light that needs updating. It updates their -//effects and then processes every turf in the queue, updating their lighting object's appearance -//Any light that returns 1 in check() deletes itself -//By using queues we are ensuring we don't perform more updates than are necessary -/datum/subsystem/lighting/fire(resumed = 0) - var/ticklimit = CURRENT_TICKLIMIT - //split our tick allotment in half so we don't spend it all on lightshift checks - CURRENT_TICKLIMIT = world.tick_usage + ((ticklimit-world.tick_usage)/2) - - var/list/changed_lights = src.changed_lights - if (!resumed) - changed_lights_workload = MC_AVERAGE(changed_lights_workload, changed_lights.len) - var/i = 1 - while (i <= changed_lights.len) - var/datum/light_source/LS = changed_lights[i++] - LS.check() - if (MC_TICK_CHECK) - break - if (i > 1) - changed_lights.Cut(1,i) - - CURRENT_TICKLIMIT = ticklimit - var/list/changed_turfs = src.changed_turfs - if (!resumed) - changed_turfs_workload = MC_AVERAGE(changed_turfs_workload, changed_turfs.len) - i = 1 - while (i <= changed_turfs.len) - var/turf/T = changed_turfs[i++] - if(T.lighting_changed) - T.redraw_lighting() - if (MC_TICK_CHECK) - break - if (i > 1) - changed_turfs.Cut(1,i) - -//same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status -/datum/subsystem/lighting/Initialize(timeofday) - var/list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz)) +/datum/subsystem/lighting/Initialize() if (config.starlight) for(var/area/A in world) - if (A.lighting_use_dynamic == DYNAMIC_LIGHTING_IFSTARLIGHT) + if (A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT) A.luminosity = 0 - for(var/thing in changed_lights) - var/datum/light_source/LS = thing - LS.check() - changed_lights.Cut() + create_all_lighting_overlays() - for(var/thing in turfs_to_init) - var/turf/T = thing - T.init_lighting() - changed_turfs.Cut() +/datum/subsystem/lighting/fire() - ..() + lighting_update_lights_old = lighting_update_lights //We use a different list so any additions to the update lists during a delay from scheck() don't cause things to be cut from the list without being updated. + lighting_update_lights = list() + for(var/datum/light_source/L in lighting_update_lights_old) -//Used to strip valid information from an existing instance and transfer it to the replacement. i.e. when a crash occurs -//It works by using spawn(-1) to transfer the data, if there is a runtime the data does not get transfered but the loop -//does not crash -/datum/subsystem/lighting/Recover() - if(!istype(SSlighting.changed_turfs)) - SSlighting.changed_turfs = list() - if(!istype(SSlighting.changed_lights)) - SSlighting.changed_lights = list() + if(L.check() || L.destroyed || L.force_update) + L.remove_lum() + if(!L.destroyed) + L.apply_lum() - for(var/thing in SSlighting.changed_lights) - var/datum/light_source/LS = thing - spawn(-1) //so we don't crash the loop (inefficient) - LS.check() + else if(L.vis_update) //We smartly update only tiles that became (in) visible to use. + L.smart_vis_update() - for(var/thing in changed_turfs) - var/turf/T = thing - if(T.lighting_changed) - spawn(-1) - T.redraw_lighting() + L.vis_update = FALSE + L.force_update = FALSE + L.needs_update = FALSE - var/msg = "## DEBUG: [time2text(world.timeofday)] [name] subsystem restarted. Reports:\n" - for(var/varname in SSlighting.vars) - switch(varname) - if("tag","bestF","type","parent_type","vars") - continue - else - var/varval1 = SSlighting.vars[varname] - var/varval2 = vars[varname] - if(istype(varval1,/list)) - varval1 = "/list([length(varval1)])" - varval2 = "/list([length(varval2)])" - msg += "\t [varname] = [varval1] -> [varval2]\n" - world.log << msg + lighting_update_corners_old = lighting_update_corners //Same as above. + lighting_update_corners = list() + for(var/A in lighting_update_corners_old) + var/datum/lighting_corner/C = A + + C.update_overlays() + + C.needs_update = FALSE + + lighting_update_overlays_old = lighting_update_overlays //Same as above. + lighting_update_overlays = list() + + for(var/atom/movable/lighting_overlay/O in lighting_update_overlays_old) + O.update_overlay() + O.needs_update = 0 diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index f86153f34f..b39fca4a6e 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -34,7 +34,7 @@ var/datum/subsystem/mapping/SSmapping else space_zlevels += i - seedRuins(space_zlevels, config.space_budget, /area/space, space_ruins_templates) + seedRuins(space_zlevels, rand(8,16), /area/space, space_ruins_templates) // Set up Z-level transistions. setup_map_transitions() diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 1687cb1b2b..421d9ba312 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -13,55 +13,25 @@ var/datum/subsystem/minimap/SSminimap NEW_SS_GLOBAL(SSminimap) /datum/subsystem/minimap/Initialize(timeofday) + if(!config.generate_minimaps) + world << "Minimap generation disabled... Skipping" + return var/hash = md5(file2text("_maps/[MAP_PATH]/[MAP_FILE]")) - if(config.generate_minimaps) - if(hash == trim(file2text(hash_path()))) - for(var/z in z_levels) //We have these files cached, let's register them - register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) - return ..() - for(var/z in z_levels) - generate(z) - register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) - fdel(hash_path()) - text2file(hash, hash_path()) - else - world << "Minimap generation disabled. Loading from cache..." - var/fileloc = 0 - if(check_files(0)) //Let's first check if we have maps cached in the data folder. NOTE: This will override the backup files even if this map is older. - world.log << "cache" - if(hash != trim(file2text(hash_path()))) - world << "Loaded cached minimap is outdated. There may be minor discrepancies in layout." //Disclaimer against players saying map is wrong. - fileloc = 0 - else - if(!check_files(1)) - world << "Failed to load backup minimap file. Aborting." //We couldn't find something. Bail to prevent issues with null files - return - fileloc = 1 //No map image cached with the current map, and we have a backup. Let's fall back to it. - world << "No cached minimaps detected. Backup files loaded." - for(var/z in z_levels) - register_asset("minimap_[z].png", fcopy_rsc(map_path(z,fileloc))) + if(hash == trim(file2text(hash_path()))) + return ..() + + for(var/z in z_levels) + generate(z) + register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) + fdel(hash_path()) + text2file(hash, hash_path()) ..() -/datum/subsystem/minimap/proc/check_files(backup) // If the backup argument is true, looks in the icons folder. If false looks in the data folder. - for(var/z in z_levels) - if(!fexists(file(map_path(z,backup)))) //Let's make sure we have a file for this map - if(backup) - world.log << "Failed to find backup file for map [MAP_NAME] on zlevel [z]." - return FALSE - return TRUE +/datum/subsystem/minimap/proc/hash_path() + return "data/minimaps/[MAP_NAME].md5" - -/datum/subsystem/minimap/proc/hash_path(backup) - if(backup) - return "icons/minimaps/[MAP_NAME].md5" - else - return "data/minimaps/[MAP_NAME].md5" - -/datum/subsystem/minimap/proc/map_path(z,backup) - if(backup) - return "icons/minimaps/[MAP_NAME]_[z].png" - else - return "data/minimaps/[MAP_NAME]_[z].png" +/datum/subsystem/minimap/proc/map_path(z) + return "data/minimaps/[MAP_NAME]_[z].png" /datum/subsystem/minimap/proc/send(client/client) for(var/z in z_levels) @@ -73,10 +43,24 @@ var/datum/subsystem/minimap/SSminimap // Scale it up to our target size. minimap.Scale(MINIMAP_SIZE, MINIMAP_SIZE) + var/counter = 512 // Loop over turfs and generate icons. for(var/T in block(locate(x1, y1, z), locate(x2, y2, z))) generate_tile(T, minimap) + //byond bug, this fixes OOM crashes by flattening and reseting the minimap icon holder every so and so tiles + counter-- + if(counter <= 0) + counter = 512 + var/icon/flatten = new /icon() + flatten.Insert(minimap, "", SOUTH, 1, 0) + del(minimap) + minimap = flatten + stoplag() //we have to sleep in order to get byond to clear out the proc's garbage bin + + CHECK_TICK + + // Create a new icon and insert the generated minimap, so that BYOND doesn't generate different directions. var/icon/final = new /icon() final.Insert(minimap, "", SOUTH, 1, 0) @@ -85,9 +69,9 @@ var/datum/subsystem/minimap/SSminimap /datum/subsystem/minimap/proc/generate_tile(turf/tile, icon/minimap) var/icon/tile_icon var/obj/obj - var/list/obj_icons + var/list/obj_icons = list() // Don't use icons for space, just add objects in space if they exist. - if(isspaceturf(tile)) + if(istype(tile, /turf/open/space)) obj = locate(/obj/structure/lattice/catwalk) in tile if(obj) tile_icon = new /icon('icons/obj/smooth_structures/catwalk.dmi', "catwalk", SOUTH) @@ -102,20 +86,18 @@ var/datum/subsystem/minimap/SSminimap tile_icon = new /icon('icons/obj/atmospherics/pipes/transit_tube.dmi', obj.icon_state, obj.dir) else tile_icon = new /icon(tile.icon, tile.icon_state, tile.dir) - obj_icons = list() + obj_icons.Cut() obj = locate(/obj/structure) in tile if(obj) - obj_icons += new /icon(obj.icon, obj.icon_state, obj.dir, 1, 0) + obj_icons += getFlatIcon(obj) obj = locate(/obj/machinery) in tile if(obj) obj_icons += new /icon(obj.icon, obj.icon_state, obj.dir, 1, 0) obj = locate(/obj/structure/window) in tile if(obj) obj_icons += new /icon('icons/obj/smooth_structures/window.dmi', "window", SOUTH) - obj = locate(/obj/structure/table) in tile - if(obj) - obj_icons += new /icon('icons/obj/smooth_structures/table.dmi', "table", SOUTH) + for(var/I in obj_icons) var/icon/obj_icon = I tile_icon.Blend(obj_icon, ICON_OVERLAY) @@ -125,3 +107,4 @@ var/datum/subsystem/minimap/SSminimap tile_icon.Scale(TILE_SIZE, TILE_SIZE) // Add the tile to the minimap. minimap.Blend(tile_icon, ICON_OVERLAY, ((tile.x - 1) * TILE_SIZE), ((tile.y - 1) * TILE_SIZE)) + del(tile_icon) diff --git a/code/controllers/subsystem/processing/objects.dm b/code/controllers/subsystem/objects.dm similarity index 83% rename from code/controllers/subsystem/processing/objects.dm rename to code/controllers/subsystem/objects.dm index 7c4852ea3a..c3c01ec47e 100644 --- a/code/controllers/subsystem/processing/objects.dm +++ b/code/controllers/subsystem/objects.dm @@ -14,13 +14,14 @@ var/datum/subsystem/objects/SSobj var/list/atom_spawners = list() var/list/processing = list() var/list/currentrun = list() + var/list/burning = list() /datum/subsystem/objects/New() NEW_SS_GLOBAL(SSobj) /datum/subsystem/objects/Initialize(timeofdayl) trigger_atom_spawners() - setupGenetics() //to set the mutations' place in structural enzymes, so monkey.initialize() knows where to put the monkey mutation. + setupGenetics() for(var/thing in world) var/atom/A = thing A.initialize() @@ -54,6 +55,12 @@ var/datum/subsystem/objects/SSobj if (MC_TICK_CHECK) return + for(var/obj/burningobj in SSobj.burning) + if(burningobj && (burningobj.burn_state == ON_FIRE)) + if(burningobj.burn_world_time < world.time) + burningobj.burn() + else + SSobj.burning.Remove(burningobj) /datum/subsystem/objects/proc/setup_template_objects(list/objects) trigger_atom_spawners(0, ignore_z=TRUE) @@ -66,3 +73,5 @@ var/datum/subsystem/objects/SSobj atom_spawners = SSobj.atom_spawners if (istype(SSobj.processing)) processing = SSobj.processing + if (istype(SSobj.burning)) + burning = SSobj.burning \ No newline at end of file diff --git a/code/controllers/subsystem/orbit.dm b/code/controllers/subsystem/orbit.dm deleted file mode 100644 index da52ae43f7..0000000000 --- a/code/controllers/subsystem/orbit.dm +++ /dev/null @@ -1,50 +0,0 @@ -var/datum/subsystem/orbit/SSorbit - -/datum/subsystem/orbit - name = "Orbits" - priority = 35 - wait = 2 - flags = SS_NO_INIT|SS_TICKER - - var/list/currentrun = list() - var/list/processing = list() - -/datum/subsystem/orbit/New() - NEW_SS_GLOBAL(SSorbit) - - -/datum/subsystem/orbit/stat_entry() - ..("P:[processing.len]") - - -/datum/subsystem/orbit/fire(resumed = 0) - if (!resumed) - src.currentrun = processing.Copy() - - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - - while (currentrun.len) - var/datum/orbit/O = currentrun[currentrun.len] - currentrun.len-- - if (!O) - processing -= O - if (MC_TICK_CHECK) - return - continue - if (!O.orbiter) - qdel(O) - if (MC_TICK_CHECK) - return - continue - if (O.lastprocess >= world.time) //we already checked recently - if (MC_TICK_CHECK) - return - continue - var/targetloc = get_turf(O.orbiting) - if (targetloc != O.lastloc || O.orbiter.loc != targetloc) - O.Check(targetloc) - if (MC_TICK_CHECK) - return - - diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 1a556e4fa2..1978c1b167 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -1,14 +1,14 @@ var/datum/subsystem/pai/SSpai -var/list/obj/item/device/paicard/pai_card_list = list() /datum/subsystem/pai name = "pAI" + init_order = 20 + flags = SS_NO_FIRE|SS_NO_INIT - flags = SS_NO_INIT|SS_NO_FIRE - + var/askDelay = 600 + var/const/NEVER_FOR_THIS_ROUND = -1 var/list/candidates = list() - var/ghost_spam = FALSE - var/spam_delay = 100 + var/list/asked = list() /datum/subsystem/pai/New() NEW_SS_GLOBAL(SSpai) @@ -29,6 +29,7 @@ var/list/obj/item/device/paicard/pai_card_list = list() pai.key = candidate.key card.setPersonality(pai) + card.looking_for_personality = 0 ticker.mode.update_cult_icons_removed(card.pai.mind) ticker.mode.update_rev_icons_removed(card.pai.mind) @@ -75,8 +76,8 @@ var/list/obj/item/device/paicard/pai_card_list = list() if("submit") if(candidate) candidate.ready = 1 - for(var/obj/item/device/paicard/p in pai_card_list) - if(!p.pai) + for(var/obj/item/device/paicard/p in world) + if(p.looking_for_personality == 1) p.alertUpdate() usr << browse(null, "window=paiRecruit") return @@ -133,20 +134,8 @@ var/list/obj/item/device/paicard/pai_card_list = list() M << browse(dat, "window=paiRecruit") -/datum/subsystem/pai/proc/spam_again() - ghost_spam = FALSE - /datum/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user) - if(!ghost_spam) - ghost_spam = TRUE - for(var/mob/dead/observer/G in player_list) - if(!G.key || !G.client) - continue - if(!(ROLE_PAI in G.client.prefs.be_special)) - continue - G << 'sound/misc/server-ready.ogg' //Alerting them to their consideration - G << "Someone is requesting a pAI personality! Use the pAI button to submit yourself as one." - addtimer(src, "spam_again", spam_delay) + requestRecruits() var/list/available = list() for(var/datum/paiCandidate/c in SSpai.candidates) if(c.ready) @@ -191,6 +180,36 @@ var/list/obj/item/device/paicard/pai_card_list = list() user << browse(dat, "window=findPai") +/datum/subsystem/pai/proc/requestRecruits() + for(var/mob/dead/observer/O in player_list) + if(jobban_isbanned(O, ROLE_PAI)) + continue + if(asked[O.ckey]) + if(world.time < asked[O.ckey] + askDelay || asked[O.ckey] == NEVER_FOR_THIS_ROUND) + continue + else + asked.Remove(O.ckey) + if(O.client) + var/hasSubmitted = 0 + for(var/datum/paiCandidate/c in SSpai.candidates) + if(c.key == O.key) + hasSubmitted = 1 + if(!hasSubmitted && (ROLE_PAI in O.client.prefs.be_special)) + question(O.client) + +/datum/subsystem/pai/proc/question(client/C) + set waitfor = 0 + if(!C) + return + asked[C.ckey] = world.time + var/response = tgalert(C, "Someone is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", "Yes", "No", "Never for this round", StealFocus=0, Timeout=askDelay) + if(!C) + return //handle logouts that happen whilst the alert is waiting for a response. + if(response == "Yes") + recruitWindow(C.mob) + else if (response == "Never for this round") + asked[C.ckey] = NEVER_FOR_THIS_ROUND + /datum/paiCandidate var/name var/key diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index a1921782ea..5f8f373212 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -1,42 +1,12 @@ var/datum/subsystem/parallax/SSparallax /datum/subsystem/parallax - name = "parallax" - wait = 2 - flags = SS_POST_FIRE_TIMING | SS_FIRE_IN_LOBBY | SS_BACKGROUND | SS_NO_INIT - priority = 65 - var/list/currentrun + name = "Space Parallax" + init_order = 18 + flags = SS_NO_FIRE /datum/subsystem/parallax/New() - NEW_SS_GLOBAL(SSparallax) - return ..() + NEW_SS_GLOBAL(SSparallax) -/datum/subsystem/parallax/fire(resumed = 0) - if (!resumed) - src.currentrun = clients.Copy() - - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - - while(length(currentrun)) - var/client/C = currentrun[currentrun.len] - currentrun.len-- - if (!C || !C.eye) - if (MC_TICK_CHECK) - return - continue - var/atom/movable/A = C.eye - if(!A) - return - for (A; isloc(A.loc) && !isturf(A.loc); A = A.loc); - - if(A != C.movingmob) - if(C.movingmob != null) - C.movingmob.client_mobs_in_contents -= C.mob - UNSETEMPTY(C.movingmob.client_mobs_in_contents) - LAZYINITLIST(A.client_mobs_in_contents) - A.client_mobs_in_contents += C.mob - C.movingmob = A - if (MC_TICK_CHECK) - return - currentrun = null \ No newline at end of file +/datum/subsystem/parallax/Initialize() + create_global_parallax_icons() diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm deleted file mode 100644 index dd1283c325..0000000000 --- a/code/controllers/subsystem/persistence.dm +++ /dev/null @@ -1,87 +0,0 @@ -var/datum/subsystem/persistence/SSpersistence - -/datum/subsystem/persistence - name = "Persistence" - init_order = -100 - flags = SS_NO_FIRE - var/savefile/secret_satchels - var/list/satchel_blacklist = list() //this is a typecache - var/list/new_secret_satchels = list() //these are objects - var/old_secret_satchels = "" - -/datum/subsystem/persistence/New() - NEW_SS_GLOBAL(SSpersistence) - -/datum/subsystem/persistence/Initialize() - secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav") - satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/weapon/crowbar)) - secret_satchels[MAP_NAME] >> old_secret_satchels - - var/list/expanded_old_satchels = list() - var/placed_satchels = 0 - - if(!isnull(old_secret_satchels)) - expanded_old_satchels = splittext(old_secret_satchels,"#") - if(PlaceSecretSatchel(expanded_old_satchels)) - placed_satchels++ - else - expanded_old_satchels.len = 0 - - var/list/free_satchels = list() - for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION)))) //Nontrivially expensive but it's roundstart only - if(isfloorturf(T) && !istype(T,/turf/open/floor/plating/)) - free_satchels += new /obj/item/weapon/storage/backpack/satchel/flat/secret(T) - if(!isemptylist(free_satchels) && ((free_satchels.len + placed_satchels) >= (50 - expanded_old_satchels.len) * 0.1)) //up to six tiles, more than enough to kill anything that moves - break - for(var/mob/living/simple_animal/parrot/Poly/P in living_mob_list) - twitterize(P.speech_buffer, "polytalk") - break //Who's been duping the bird?! - - ..() - -/datum/subsystem/persistence/proc/CollectData() - CollectSecretSatchels() - -/datum/subsystem/persistence/proc/PlaceSecretSatchel(list/expanded_old_satchels) - var/satchel_string - - if(expanded_old_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear. - satchel_string = pick_n_take(expanded_old_satchels) - - old_secret_satchels = jointext(expanded_old_satchels,"#") - secret_satchels[MAP_NAME] << old_secret_satchels - - var/list/chosen_satchel = splittext(satchel_string,"|") - if(!chosen_satchel || isemptylist(chosen_satchel) || chosen_satchel.len != 3) //Malformed - return 0 - - var/path = text2path(chosen_satchel[3]) //If the item no longer exist, this returns null - if(!path) - return 0 - - var/obj/item/weapon/storage/backpack/satchel/flat/F = new() - F.x = text2num(chosen_satchel[1]) - F.y = text2num(chosen_satchel[2]) - F.z = ZLEVEL_STATION - if(isfloorturf(F.loc) && !istype(F.loc,/turf/open/floor/plating/)) - F.hide(1) - new path(F) - return 1 - -/datum/subsystem/persistence/proc/CollectSecretSatchels() - for(var/A in new_secret_satchels) - var/obj/item/weapon/storage/backpack/satchel/flat/F = A - if(qdeleted(F) || F.z != ZLEVEL_STATION || F.invisibility != INVISIBILITY_MAXIMUM) - continue - var/list/savable_obj = list() - for(var/obj/O in F) - if(is_type_in_typecache(O, satchel_blacklist) || O.admin_spawned) - continue - if(O.persistence_replacement) - savable_obj += O.persistence_replacement - else - savable_obj += O.type - if(isemptylist(savable_obj)) - continue - old_secret_satchels += "[F.x]|[F.y]|[pick(savable_obj)]#" - secret_satchels[MAP_NAME] << old_secret_satchels diff --git a/code/controllers/subsystem/pool.dm b/code/controllers/subsystem/pool.dm deleted file mode 100644 index 245e733e98..0000000000 --- a/code/controllers/subsystem/pool.dm +++ /dev/null @@ -1,48 +0,0 @@ -var/datum/subsystem/pool/SSpool - -/datum/subsystem/pool - name = "Pool" - init_order = 20 - flags = SS_BACKGROUND | SS_FIRE_IN_LOBBY - var/list/global_pool - var/list/pool_levels = list() - var/sum = 0 - - var/list/maintained_types = list( - /obj/item/stack/tile/plasteel = 100 - ) - - var/list/stats_placed_in_pool = list() - var/list/stats_pooled_or_newed = list() - var/list/stats_reused = list() - var/list/stats_created_new = list() - -/datum/subsystem/pool/New() - NEW_SS_GLOBAL(SSpool) - -/datum/subsystem/pool/Initialize(timeofday) - global_pool = GlobalPool - -/datum/subsystem/pool/stat_entry(msg) - if(global_pool) - msg += "Types: [global_pool.len]|Total Pooled Objects: [sum]" - else - msg += "NULL POOL" - ..(msg) - -/datum/subsystem/pool/fire() - sum = 0 - for(var/type in global_pool + maintained_types) - var/list/L = global_pool[type] - var/required_number = maintained_types[type] || 0 - - // Update pool levels and tracker - var/amount = 0 - if(L) - amount = L.len - sum += amount - - // why yes, just inflate the pool at one item per tick - if(amount < required_number) - var/diver = new type - qdel(diver) diff --git a/code/controllers/subsystem/processing/fastprocess.dm b/code/controllers/subsystem/processing/fastprocess.dm deleted file mode 100644 index 7a46f253ef..0000000000 --- a/code/controllers/subsystem/processing/fastprocess.dm +++ /dev/null @@ -1,10 +0,0 @@ -//Fires five times every second. - -var/datum/subsystem/processing/fastprocess/SSfastprocess -/datum/subsystem/processing/fastprocess - name = "Fast Processing" - wait = 2 - stat_tag = "FP" - -/datum/subsystem/processing/fastprocess/New() - NEW_SS_GLOBAL(SSfastprocess) diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm deleted file mode 100644 index 92540ba442..0000000000 --- a/code/controllers/subsystem/processing/processing.dm +++ /dev/null @@ -1,34 +0,0 @@ -//Used to process objects. Fires once every second. - -var/datum/subsystem/processing/SSprocessing -/datum/subsystem/processing - name = "Processing" - priority = 25 - flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT - wait = 10 - - var/stat_tag = "P" //Used for logging - var/list/processing = list() - var/list/currentrun = list() - -/datum/subsystem/processing/New() - NEW_SS_GLOBAL(SSprocessing) - -/datum/subsystem/processing/stat_entry() - ..("[stat_tag]:[processing.len]") - -/datum/subsystem/processing/fire(resumed = 0) - if (!resumed) - currentrun = processing.Copy() - //cache for sanic speed (lists are references anyways) - var/list/current_run = currentrun - - while(current_run.len) - var/datum/thing = current_run[current_run.len] - current_run.len-- - if(thing) - thing.process(wait) - else - processing -= thing - if (MC_TICK_CHECK) - return diff --git a/code/controllers/subsystem/religion.dm b/code/controllers/subsystem/religion.dm deleted file mode 100644 index 69ec3fe7d5..0000000000 --- a/code/controllers/subsystem/religion.dm +++ /dev/null @@ -1,17 +0,0 @@ -var/datum/subsystem/religion/SSreligion - -/datum/subsystem/religion - name = "Religion" - init_order = 19 - flags = SS_NO_FIRE|SS_NO_INIT - - var/bible_deity_name - var/Bible_icon_state - var/Bible_item_state - var/Bible_name - var/Bible_deity_name - - var/holy_weapon - -/datum/subsystem/religion/New() - NEW_SS_GLOBAL(SSreligion) diff --git a/code/controllers/subsystem/server_maintenance.dm b/code/controllers/subsystem/server_maintenance.dm index 1e4b4ae76f..70c03b7591 100644 --- a/code/controllers/subsystem/server_maintenance.dm +++ b/code/controllers/subsystem/server_maintenance.dm @@ -3,16 +3,12 @@ var/datum/subsystem/server_maint/SSserver /datum/subsystem/server_maint name = "Server Tasks" wait = 6000 - flags = SS_NO_TICK_CHECK + init_order = 19 + flags = SS_NO_TICK_CHECK|SS_NO_INIT /datum/subsystem/server_maint/New() NEW_SS_GLOBAL(SSserver) -/datum/subsystem/server_maint/Initialize(timeofday) - if (config.hub) - world.visibility = 1 - ..() - /datum/subsystem/server_maint/fire() //handle kicking inactive players if(config.kick_inactive > 0) @@ -21,7 +17,7 @@ var/datum/subsystem/server_maint/SSserver if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") C << "You have been inactive for more than 10 minutes and have been disconnected." - qdel(C) + del(C) if(config.sql_enabled) sql_poll_players() diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index db4cd6fbec..8860b58864 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -1,5 +1,3 @@ -#define HIGHLIGHT_DYNAMIC_TRANSIT 1 - var/datum/subsystem/shuttle/SSshuttle /datum/subsystem/shuttle @@ -12,10 +10,6 @@ var/datum/subsystem/shuttle/SSshuttle var/list/stationary = list() var/list/transit = list() - var/list/turf/transit_turfs = list() - var/list/transit_requesters = list() - var/clear_transit = FALSE - //emergency shuttle stuff var/obj/docking_port/mobile/emergency/emergency var/obj/docking_port/mobile/emergency/backup/backup_shuttle @@ -24,7 +18,6 @@ var/datum/subsystem/shuttle/SSshuttle var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) var/area/emergencyLastCallLoc var/emergencyNoEscape - var/list/hostileEnvironments = list() //supply shuttle stuff var/obj/docking_port/mobile/supply/supply @@ -40,9 +33,6 @@ var/datum/subsystem/shuttle/SSshuttle var/datum/round_event/shuttle_loan/shuttle_loan - var/shuttle_purchased = FALSE //If the station has purchased a replacement escape shuttle this round - var/list/shuttle_purchase_requirements_met = list() //For keeping track of ingame events that would unlock new shuttles, such as defeating a boss or discovering a secret item - /datum/subsystem/shuttle/New() NEW_SS_GLOBAL(SSshuttle) @@ -63,87 +53,16 @@ var/datum/subsystem/shuttle/SSshuttle supply_packs[P.type] = P initial_move() - setup_transit_zone() -#ifdef HIGHLIGHT_DYNAMIC_TRANSIT - color_space() -#endif + ..() -/datum/subsystem/shuttle/proc/setup_transit_zone() - if(transit_markers.len == 0) - WARNING("No /obj/effect/landmark/transit placed on the map!") - return - // transit zone - var/turf/A = get_turf(transit_markers[1]) - var/turf/B = get_turf(transit_markers[2]) - for(var/i in block(A, B)) - var/turf/T = i - T.ChangeTurf(/turf/open/space) - transit_turfs += T - T.flags |= UNUSED_TRANSIT_TURF - -#ifdef HIGHLIGHT_DYNAMIC_TRANSIT -/datum/subsystem/shuttle/proc/color_space() - if(transit_markers.len == 0) - WARNING("No /obj/effect/landmark/transit placed on the map!") - return - var/turf/A = get_turf(transit_markers[1]) - var/turf/B = get_turf(transit_markers[2]) - for(var/i in block(A, B)) - var/turf/T = i - // Only dying the "pure" space, not the transit tiles - if(istype(T, /turf/open/space/transit) || !isspaceturf(T)) - continue - if((T.x == A.x) || (T.x == B.x) || (T.y == A.y) || (T.y == B.y)) - T.color = "#ffff00" - else - T.color = "#00ffff" -#endif - - //world.log << "[transit_turfs.len] transit turfs registered" /datum/subsystem/shuttle/fire() for(var/thing in mobile) - if(!thing) - mobile.Remove(thing) + if(thing) + var/obj/docking_port/mobile/P = thing + P.check() continue - var/obj/docking_port/mobile/P = thing - P.check() - var/changed_transit = FALSE - for(var/thing in transit) - var/obj/docking_port/stationary/transit/T = thing - if(!T.owner) - qdel(T, force=TRUE) - changed_transit = TRUE - // This next one removes transit docks/zones that aren't - // immediately being used. This will mean that the zone creation - // code will be running a lot. - var/obj/docking_port/mobile/owner = T.owner - if(owner) - var/idle = owner.mode == SHUTTLE_IDLE - var/not_centcom_evac = owner.launch_status == NOLAUNCH - var/not_in_use = (!T.get_docked()) - if(idle && not_centcom_evac && not_in_use) - qdel(T, force=TRUE) - changed_transit = TRUE - if(clear_transit) - transit_requesters.Cut() - for(var/i in transit) - qdel(i, force=TRUE) - setup_transit_zone() - clear_transit = FALSE - changed_transit = TRUE -#ifdef HIGHLIGHT_DYNAMIC_TRANSIT - if(changed_transit) - color_space() -#endif - - while(transit_requesters.len) - var/requester = popleft(transit_requesters) - var/success = generate_transit_dock(requester) - if(!success) // BACK OF THE QUEUE - transit_requesters += requester - if(MC_TICK_CHECK) - return + mobile.Remove(thing) /datum/subsystem/shuttle/proc/getShuttle(id) for(var/obj/docking_port/mobile/M in mobile) @@ -186,9 +105,6 @@ var/datum/subsystem/shuttle/SSshuttle if(SHUTTLE_DOCKED) user << "The emergency shuttle is already here." return - if(SHUTTLE_IGNITING) - user << "The emergency shuttle is firing its engines to leave." - return if(SHUTTLE_ESCAPE) user << "The emergency shuttle is moving away to a safe distance." return @@ -198,24 +114,22 @@ var/datum/subsystem/shuttle/SSshuttle call_reason = trim(html_encode(call_reason)) - if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH && seclevel2num(get_security_level()) > SEC_LEVEL_GREEN) + if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) user << "You must provide a reason." return var/area/signal_origin = get_area(user) var/emergency_reason = "\nNature of emergency:\n\n[call_reason]" - var/security_num = seclevel2num(get_security_level()) - switch(security_num) - if(SEC_LEVEL_GREEN) - emergency.request(null, 2, signal_origin, html_decode(emergency_reason), 0) - if(SEC_LEVEL_BLUE) - emergency.request(null, 1, signal_origin, html_decode(emergency_reason), 0) - else - emergency.request(null, 0.5, signal_origin, html_decode(emergency_reason), 1) // There is a serious threat we gotta move no time to give them five minutes. + if(seclevel2num(get_security_level()) == SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. + emergency.request(null, 0.5, signal_origin, html_decode(emergency_reason), 1) + else + emergency.request(null, 1, signal_origin, html_decode(emergency_reason), 0) log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.") + return + // Called when an emergency shuttle mobile docking port is // destroyed, which will only happen with admin intervention /datum/subsystem/shuttle/proc/emergencyDeregister() @@ -235,24 +149,19 @@ var/datum/subsystem/shuttle/SSshuttle return if(ticker.mode.name == "meteor") return - var/security_num = seclevel2num(get_security_level()) - switch(security_num) - if(SEC_LEVEL_GREEN) - if(emergency.timeLeft(1) < emergencyCallTime) - return - if(SEC_LEVEL_BLUE) - if(emergency.timeLeft(1) < emergencyCallTime * 0.5) - return - else - if(emergency.timeLeft(1) < emergencyCallTime * 0.25) - return + if(seclevel2num(get_security_level()) == SEC_LEVEL_RED) + if(emergency.timeLeft(1) < emergencyCallTime * 0.25) + return + else + if(emergency.timeLeft(1) < emergencyCallTime * 0.5) + return return 1 /datum/subsystem/shuttle/proc/autoEvac() var/callShuttle = 1 for(var/thing in shuttle_caller_list) - if(isAI(thing)) + if(istype(thing, /mob/living/silicon/ai)) var/mob/living/silicon/ai/AI = thing if(AI.stat || !AI.client) continue @@ -272,34 +181,6 @@ var/datum/subsystem/shuttle/SSshuttle log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.") message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") -/datum/subsystem/shuttle/proc/registerHostileEnvironment(datum/bad) - hostileEnvironments[bad] = TRUE - checkHostileEnvironment() - -/datum/subsystem/shuttle/proc/clearHostileEnvironment(datum/bad) - hostileEnvironments -= bad - checkHostileEnvironment() - -/datum/subsystem/shuttle/proc/checkHostileEnvironment() - for(var/datum/d in hostileEnvironments) - if(!istype(d) || qdeleted(d)) - hostileEnvironments -= d - emergencyNoEscape = hostileEnvironments.len - - if(emergencyNoEscape && (emergency.mode == SHUTTLE_IGNITING)) - emergency.mode = SHUTTLE_STRANDED - emergency.timer = null - emergency.sound_played = FALSE - priority_announce("Hostile environment detected. \ - Departure has been postponed indefinitely pending \ - conflict resolution.", null, 'sound/misc/notice1.ogg', "Priority") - if(!emergencyNoEscape && (emergency.mode == SHUTTLE_STRANDED)) - emergency.mode = SHUTTLE_DOCKED - emergency.setTimer(emergencyDockTime) - priority_announce("Hostile environment resolved. \ - You have 3 minutes to board the Emergency Shuttle.", - null, 'sound/AI/shuttledock.ogg', "Priority") - //try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons /datum/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed) var/obj/docking_port/mobile/M = getShuttle(shuttleId) @@ -332,149 +213,11 @@ var/datum/subsystem/shuttle/SSshuttle return 2 return 0 //dock successful -/datum/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M) - if(!istype(M)) - throw EXCEPTION("[M] is not a mobile docking port") - - if(M.assigned_transit) - return - else - if(!(M in transit_requesters)) - transit_requesters += M - -/datum/subsystem/shuttle/proc/generate_transit_dock(obj/docking_port/mobile/M) - // First, determine the size of the needed zone - // Because of shuttle rotation, the "width" of the shuttle is not - // always x. - var/travel_dir = M.preferred_direction - // Remember, the direction is the direction we appear to be - // coming from - var/dock_angle = dir2angle(M.preferred_direction) + M.port_angle + 180 - var/dock_dir = angle2dir(dock_angle) - - var/transit_width = SHUTTLE_TRANSIT_BORDER * 2 - var/transit_height = SHUTTLE_TRANSIT_BORDER * 2 - - // Shuttles travelling on their side have their dimensions swapped - // from our perspective - switch(dock_dir) - if(NORTH, SOUTH) - transit_width += M.width - transit_height += M.height - if(EAST, WEST) - transit_width += M.height - transit_height += M.width -/* - world << "The attempted transit dock will be [transit_width] width, and \ - [transit_height] in height. The travel dir is [travel_dir]." -*/ - - // Then find a place to put the zone - - var/list/proposed_zone - - base: - for(var/i in transit_turfs) - CHECK_TICK - var/turf/topleft = i - if(!(topleft.flags & UNUSED_TRANSIT_TURF)) - continue - var/turf/bottomright = locate(topleft.x + transit_width, - topleft.y + transit_height, topleft.z) - if(!bottomright) - continue - if(!(bottomright.flags & UNUSED_TRANSIT_TURF)) - continue - - proposed_zone = block(topleft, bottomright) - if(!proposed_zone) - continue - for(var/j in proposed_zone) - var/turf/T = j - if(!T) - continue base - if(!(T.flags & UNUSED_TRANSIT_TURF)) - continue base - //world << "[COORD(topleft)] and [COORD(bottomright)]" - break base - - if((!proposed_zone) || (!proposed_zone.len)) - return FALSE - - var/turf/topleft = proposed_zone[1] - //world << "[COORD(topleft)] is TOPLEFT" - // Then create a transit docking port in the middle - var/coords = M.return_coords(0, 0, dock_dir) - //world << json_encode(coords) - /* 0------2 - | | - | | - | x | - 3------1 - */ - - var/x0 = coords[1] - var/y0 = coords[2] - var/x1 = coords[3] - var/y1 = coords[4] - // Then we want the point closest to -infinity,-infinity - var/x2 = min(x0, x1) - var/y2 = min(y0, y1) -/* - var/lowx = topleft.x + SHUTTLE_TRANSIT_BORDER - var/lowy = topleft.y + SHUTTLE_TRANSIT_BORDER - - var/turf/low_point = locate(lowx, lowy, topleft.z) - new /obj/effect/landmark/stationary(low_point) - world << "Starting at the low point, we go [x2],[y2]" -*/ - // Then invert the numbers - var/transit_x = topleft.x + SHUTTLE_TRANSIT_BORDER + abs(x2) - var/transit_y = topleft.y + SHUTTLE_TRANSIT_BORDER + abs(y2) - - var/transit_path = /turf/open/space/transit - switch(travel_dir) - if(NORTH) - transit_path = /turf/open/space/transit/north - if(SOUTH) - transit_path = /turf/open/space/transit/south - if(EAST) - transit_path = /turf/open/space/transit/east - if(WEST) - transit_path = /turf/open/space/transit/west - - //world << "Docking port at [transit_x], [transit_y], [topleft.z]" - var/turf/midpoint = locate(transit_x, transit_y, topleft.z) - if(!midpoint) - return FALSE - //world << "Making transit dock at [COORD(midpoint)]" - var/area/shuttle/transit/A = new() - A.parallax_movedir = travel_dir - var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint) - new_transit_dock.assigned_turfs = proposed_zone - new_transit_dock.name = "Transit for [M.id]/[M.name]" - new_transit_dock.turf_type = transit_path - new_transit_dock.owner = M - new_transit_dock.assigned_area = A - - - // Add 180, because ports point inwards, rather than outwards - new_transit_dock.setDir(angle2dir(dock_angle)) - - for(var/i in new_transit_dock.assigned_turfs) - var/turf/T = i - T.ChangeTurf(transit_path) - T.flags &= ~(UNUSED_TRANSIT_TURF) - A.contents += T - - M.assigned_transit = new_transit_dock - return TRUE - /datum/subsystem/shuttle/proc/initial_move() for(var/obj/docking_port/mobile/M in mobile) if(!M.roundstart_move) continue - M.dockRoundstart() + moveShuttle(M.id, "[M.roundstart_move]", 0) CHECK_TICK /datum/subsystem/shuttle/Recover() @@ -496,8 +239,6 @@ var/datum/subsystem/shuttle/SSshuttle backup_shuttle = SSshuttle.backup_shuttle if (istype(SSshuttle.supply)) supply = SSshuttle.supply - if (istype(SSshuttle.transit_turfs)) - transit_turfs = SSshuttle.transit_turfs centcom_message = SSshuttle.centcom_message ordernum = SSshuttle.ordernum diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index ce94670ecf..9261d84ce5 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -2,9 +2,9 @@ var/datum/subsystem/spacedrift/SSspacedrift /datum/subsystem/spacedrift name = "Space Drift" - priority = 30 + priority = 40 wait = 5 - flags = SS_NO_INIT|SS_KEEP_TIMING + flags = SS_NO_INIT|SS_BACKGROUND var/list/currentrun = list() var/list/processing = list() @@ -61,4 +61,3 @@ var/datum/subsystem/spacedrift/SSspacedrift AM.inertia_last_loc = AM.loc if (MC_TICK_CHECK) return - diff --git a/code/controllers/subsystem/squeak.dm b/code/controllers/subsystem/squeak.dm deleted file mode 100644 index 055dc98c30..0000000000 --- a/code/controllers/subsystem/squeak.dm +++ /dev/null @@ -1,44 +0,0 @@ -var/datum/subsystem/squeak/SSsqueak - -// The Squeak -// because this is about placement of mice mobs, and nothing to do with -// mice - the computer peripheral - -/datum/subsystem/squeak - name = "Squeak" - priority = 40 - flags = SS_NO_FIRE - - var/list/exposed_wires = list() - -/datum/subsystem/squeak/New() - NEW_SS_GLOBAL(SSsqueak) - -/datum/subsystem/squeak/Initialize(timeofday) - trigger_migration() - -/datum/subsystem/squeak/proc/trigger_migration(num_mice=10) - find_exposed_wires() - - var/mob/living/simple_animal/mouse/M - var/turf/proposed_turf - - while((num_mice > 0) && exposed_wires.len) - proposed_turf = pick_n_take(exposed_wires) - if(!M) - M = new(proposed_turf) - else - M.forceMove(proposed_turf) - if(M.environment_is_safe()) - num_mice -= 1 - M = null - -/datum/subsystem/squeak/proc/find_exposed_wires() - exposed_wires.Cut() - - var/list/all_turfs = block(locate(1,1,1), locate(world.maxx,world.maxy,1)) - for(var/turf/open/floor/plating/T in all_turfs) - if(is_blocked_turf(T)) - continue - if(locate(/obj/structure/cable) in T) - exposed_wires += T diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm deleted file mode 100644 index e33e9f6665..0000000000 --- a/code/controllers/subsystem/stickyban.dm +++ /dev/null @@ -1,37 +0,0 @@ -var/datum/subsystem/stickyban/SSstickyban - -/datum/subsystem/stickyban - name = "Sticky Ban" - init_order = -10 - flags = SS_NO_FIRE - - var/list/cache = list() - -/datum/subsystem/stickyban/New() - NEW_SS_GLOBAL(SSstickyban) - -/datum/subsystem/stickyban/Initialize(timeofday) - var/list/bannedkeys = world.GetConfig("ban") - //sanitize the sticky ban list - for (var/bannedkey in bannedkeys) - var/ckey = ckey(bannedkey) - var/list/ban = stickyban2list(world.GetConfig("ban", bannedkey)) - - //byond stores sticky bans by key, that can end up confusing things - //i also remove it here so that if any stickybans cause a runtime, they just stop existing - world.SetConfig("ban", bannedkey, null) - - if (!ban["ckey"]) - ban["ckey"] = ckey - - //storing these can break things and isn't needed for sticky ban tracking - ban -= "IP" - ban -= "computer_id" - - ban["matches_this_round"] = list() - ban["existing_user_matches_this_round"] = list() - ban["admin_matches_this_round"] = list() - cache[ckey] = ban - - for (var/bannedckey in cache) - world.SetConfig("ban", bannedckey, list2stickyban(cache[bannedckey])) diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 0a82e857ac..01240d4ef7 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -18,9 +18,6 @@ var/datum/subsystem/tgui/SStgui NEW_SS_GLOBAL(SStgui) -/datum/subsystem/tgui/Shutdown() - close_all_uis() - /datum/subsystem/tgui/stat_entry() ..("P:[processing_uis.len]") diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index a5dd55503a..8738c3e65f 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -22,19 +22,21 @@ var/datum/subsystem/ticker/ticker var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking. + //These bible variables should be a preference + var/Bible_icon_state //icon_state the chaplain has chosen for his bible + var/Bible_item_state //item_state the chaplain has chosen for his bible + var/Bible_name //name of the bible + var/Bible_deity_name //name of chaplin's deity + var/list/syndicate_coalition = list() //list of traitor-compatible factions var/list/factions = list() //list of all factions var/list/availablefactions = list() //list of factions with openings - var/list/scripture_states = list(SCRIPTURE_DRIVER = TRUE, \ - SCRIPTURE_SCRIPT = FALSE, \ - SCRIPTURE_APPLICATION = FALSE, \ - SCRIPTURE_REVENANT = FALSE, \ - SCRIPTURE_JUDGEMENT = FALSE) //list of clockcult scripture states for announcements var/delay_end = 0 //if set true, the round will not restart on it's own var/triai = 0 //Global holder for Triumvirate var/tipped = 0 //Did we broadcast the tip of the day yet? + var/modevoted = 0 //Have we sent a vote for the gamemode? var/selected_tip // What will be the tip of the day? var/timeLeft = 1200 //pregame timer @@ -49,12 +51,11 @@ var/datum/subsystem/ticker/ticker var/maprotatechecked = 0 - var/news_report /datum/subsystem/ticker/New() NEW_SS_GLOBAL(ticker) - login_music = pickweight(list('sound/ambience/title2.ogg' = 15, 'sound/ambience/title1.ogg' =15, 'sound/ambience/title3.ogg' =14, 'sound/ambience/title4.ogg' =14, 'sound/misc/i_did_not_grief_them.ogg' =14, 'sound/ambience/clown.ogg' = 9)) // choose title music! + login_music = pickweight(list('sound/ambience/title1.ogg' = 30, 'sound/ambience/title2.ogg' = 30, 'sound/ambience/title3.ogg' = 30, 'sound/ambience/title4.ogg' = 30, 'sound/ambience/title5.ogg' = 30, 'sound/ambience/title6.ogg' = 30, 'sound/ambience/title7.ogg' = 30, 'sound/ambience/clown.ogg' = 3)) // choose title music! if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) login_music = 'sound/ambience/clown.ogg' @@ -63,14 +64,15 @@ var/datum/subsystem/ticker/ticker syndicate_code_phrase = generate_code_phrase() if(!syndicate_code_response) syndicate_code_response = generate_code_phrase() + setupFactions() ..() /datum/subsystem/ticker/fire() switch(current_state) if(GAME_STATE_STARTUP) timeLeft = config.lobby_countdown * 10 - world << "Welcome to [station_name()]!" - world << "Please set up your character and select \"Ready\". The game will start in [config.lobby_countdown] seconds." + world << "Welcome to the pre-game lobby!" + world << "Please, setup your character and select ready. Game will start in [config.lobby_countdown] seconds" current_state = GAME_STATE_PREGAME if(GAME_STATE_PREGAME) @@ -87,6 +89,10 @@ var/datum/subsystem/ticker/ticker return timeLeft -= wait + if(timeLeft <= 1200 && !modevoted) //Vote for the round type + send_gamemode_vote() + modevoted = TRUE + if(timeLeft <= 300 && !tipped) send_tip_of_the_round() tipped = TRUE @@ -103,7 +109,6 @@ var/datum/subsystem/ticker/ticker mode.process(wait * 0.1) check_queue() check_maprotate() - scripture_states = scripture_unlock_alert(scripture_states) if(!mode.explosion_in_progress && mode.check_finished() || force_ending) current_state = GAME_STATE_FINISHED @@ -154,19 +159,19 @@ var/datum/subsystem/ticker/ticker if(!can_continue) qdel(mode) mode = null - world << "Error setting up [master_mode]. Reverting to pre-game lobby." + world << "Error setting up [master_mode]. It's likely that there are no available antagonists for the selected mode. Reverting to pre-game lobby." SSjob.ResetOccupations() return 0 else - message_admins("DEBUG: Bypassing prestart checks...") + world << "DEBUG: Bypassing prestart checks..." if(hide_mode) var/list/modes = new for (var/datum/game_mode/M in runnable_modes) modes += M.name modes = sortList(modes) - world << "The gamemode is: secret!\n\ - Possibilities: [english_list(modes)]" + world << "The current game mode is - Secret!" + world << "Possibilities: [english_list(modes)]" else mode.announce() @@ -217,25 +222,25 @@ var/datum/subsystem/ticker/ticker //initialise our cinematic screen object cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity=0;screen_loc="1,0";}(src) + var/obj/structure/bed/temp_buckle = new(src) if(station_missed) for(var/mob/M in mob_list) - M.notransform = TRUE //stop everything moving + M.buckled = temp_buckle //buckles the mob so it can't do anything if(M.client) M.client.screen += cinematic //show every client the cinematic else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived" for(var/mob/M in mob_list) + M.buckled = temp_buckle if(M.client) M.client.screen += cinematic if(M.stat != DEAD) var/turf/T = get_turf(M) if(T && T.z==1) M.death(0) //no mercy - else - M.notransform=TRUE //no moving for you //Now animate the cinematic switch(station_missed) - if(NUKE_NEAR_MISS) //nuke was nearby but (mostly) missed + if(1) //nuke was nearby but (mostly) missed if( mode && !override ) override = mode.name switch( override ) @@ -261,7 +266,7 @@ var/datum/subsystem/ticker/ticker //flick("end",cinematic) - if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE) //nuke was nowhere nearby //TODO: a really distant explosion animation + if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) world << sound('sound/effects/explosionfar.ogg') else //station was destroyed @@ -295,8 +300,8 @@ var/datum/subsystem/ticker/ticker if(cinematic) qdel(cinematic) cinematic = null - for(var/mob/M in mob_list) - M.notransform = FALSE + if(temp_buckle) + qdel(temp_buckle) return //Faster exit, since nothing happened else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) @@ -309,8 +314,8 @@ var/datum/subsystem/ticker/ticker spawn(300) if(cinematic) qdel(cinematic) //end the cinematic - for(var/mob/M in mob_list) - M.notransform = FALSE //gratz you survived + if(temp_buckle) + qdel(temp_buckle) //release everybody return @@ -345,7 +350,7 @@ var/datum/subsystem/ticker/ticker SSjob.EquipRank(player, player.mind.assigned_role, 0) if(captainless) for(var/mob/M in player_list) - if(!isnewplayer(M)) + if(!istype(M,/mob/new_player)) M << "Captainship not forced on anyone." @@ -380,15 +385,10 @@ var/datum/subsystem/ticker/ticker world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" - if(mode.station_was_nuked) - ticker.news_report = STATION_DESTROYED_NUKE if(joined_player_list.len) world << "
[TAB]Total Population: [joined_player_list.len]" if(station_evacuated) world << "
[TAB]Evacuation Rate: [num_escapees] ([round((num_escapees/joined_player_list.len)*100, 0.1)]%)" - news_report = STATION_EVACUATED - if(SSshuttle.emergency.is_hijacked()) - news_report = SHUTTLE_HIJACK world << "
[TAB]Survival Rate: [num_survivors] ([round((num_survivors/joined_player_list.len)*100, 0.1)]%)" world << "
" @@ -421,9 +421,6 @@ var/datum/subsystem/ticker/ticker mode.declare_completion()//To declare normal completion. - if(cross_allowed) - send_news_report() - //calls auto_declare_completion_* for all modes for(var/handler in typesof(/datum/game_mode/proc)) if (findtext("[handler]","auto_declare_completion_")) @@ -446,44 +443,6 @@ var/datum/subsystem/ticker/ticker for(var/i in total_antagonists) log_game("[i]s[total_antagonists[i]].") - //Borers - var/borerwin = FALSE - if(borers.len) - var/borertext = "
The borers were:" - for(var/mob/living/simple_animal/borer/B in borers) - if((B.key || B.controlling) && B.stat != DEAD) - borertext += "
[B.controlling ? B.victim.key : B.key] was [B.truename] (" - var/turf/location = get_turf(B) - if(location.z == ZLEVEL_CENTCOM && B.victim) - borertext += "escaped with host" - else - borertext += "failed" - borertext += ")" - world << borertext - - var/total_borers = 0 - for(var/mob/living/simple_animal/borer/B in borers) - if((B.key || B.victim) && B.stat != DEAD) - total_borers++ - if(total_borers) - var/total_borer_hosts = 0 - for(var/mob/living/carbon/C in mob_list) - var/mob/living/simple_animal/borer/D = C.has_brain_worms() - var/turf/location = get_turf(C) - if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD) - total_borer_hosts++ - if(total_borer_hosts_needed <= total_borer_hosts) - borerwin = TRUE - world << "There were [total_borers] borers alive at round end!" - world << "A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive. The borers needed [total_borer_hosts_needed] hosts to escape." - if(borerwin) - world << "The borers were successful!" - else - world << "The borers have failed!" - return TRUE - - mode.declare_station_goal_completion() - //Adds the del() log to world.log in a format condensable by the runtime condenser found in tools if(SSgarbage.didntgc.len) var/dellog = "" @@ -492,8 +451,6 @@ var/datum/subsystem/ticker/ticker dellog += "Failures : [SSgarbage.didntgc[path]] \n" world.log << dellog - //Collects persistence features - SSpersistence.CollectData() return 1 /datum/subsystem/ticker/proc/send_tip_of_the_round() @@ -569,6 +526,11 @@ var/datum/subsystem/ticker/ticker minds = ticker.minds + Bible_icon_state = ticker.Bible_icon_state + Bible_item_state = ticker.Bible_item_state + Bible_name = ticker.Bible_name + Bible_deity_name = ticker.Bible_deity_name + syndicate_coalition = ticker.syndicate_coalition factions = ticker.factions availablefactions = ticker.availablefactions @@ -589,55 +551,5 @@ var/datum/subsystem/ticker/ticker cinematic = ticker.cinematic maprotatechecked = ticker.maprotatechecked - -/datum/subsystem/ticker/proc/send_news_report() - var/news_message - var/news_source = "Nanotrasen News Network" - switch(news_report) - if(NUKE_SYNDICATE_BASE) - news_message = "In a daring raid, the heroic crew of [station_name()] detonated a nuclear device in the heart of a terrorist base." - if(STATION_DESTROYED_NUKE) - news_message = "We would like to reassure all employees that the reports of a Syndicate backed nuclear attack on [station_name()] are, in fact, a hoax. Have a secure day!" - if(STATION_EVACUATED) - news_message = "The crew of [station_name()] has been evacuated amid unconfirmed reports of enemy activity." - if(GANG_LOSS) - news_message = "Organized crime aboard [station_name()] has been stamped out by members of our ever vigilant security team. Remember to thank your assigned officers today!" - if(GANG_TAKEOVER) - news_message = "Contact with [station_name()] has been lost after a sophisticated hacking attack by organized criminal elements. Stay vigilant!" - if(BLOB_WIN) - news_message = "[station_name()] was overcome by an unknown biological outbreak, killing all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station." - if(BLOB_NUKE) - news_message = "[station_name()] is currently undergoing decontanimation after a controlled burst of radiation was used to remove a biological ooze. All employees were safely evacuated prior, and are enjoying a relaxing vacation." - if(BLOB_DESTROYED) - news_message = "[station_name()] is currently undergoing decontamination procedures after the destruction of a biological hazard. As a reminder, any crew members experiencing cramps or bloating should report immediately to security for incineration." - if(CULT_ESCAPE) - news_message = "Security Alert: A group of religious fanatics have escaped from [station_name()]." - if(CULT_FAILURE) - news_message = "Following the dismantling of a restricted cult aboard [station_name()], we would like to remind all employees that worship outside of the Chapel is strictly prohibited, and cause for termination." - if(CULT_SUMMON) - news_message = "Company officials would like to clarify that [station_name()] was scheduled to be decommissioned following meteor damage earlier this year. Earlier reports of an unknowable eldritch horror were made in error." - if(NUKE_MISS) - news_message = "The Syndicate have bungled a terrorist attack [station_name()], detonating a nuclear weapon in empty space near by." - if(OPERATIVES_KILLED) - news_message = "Repairs to [station_name()] are underway after an elite Syndicate death squad was wiped out by the crew." - if(OPERATIVE_SKIRMISH) - news_message = "A skirmish between security forces and Syndicate agents aboard [station_name()] ended with both sides bloodied but intact." - if(REVS_WIN) - news_message = "Company officials have reassured investors that despite a union led revolt aboard [station_name()] that there will be no wage increases for workers." - if(REVS_LOSE) - news_message = "[station_name()] quickly put down a misguided attempt at mutiny. Remember, unionizing is illegal!" - if(WIZARD_KILLED) - news_message = "Tensions have flared with the Wizard's Federation following the death of one of their members aboard [station_name()]." - if(STATION_NUKED) - news_message = "[station_name()] activated its self destruct device for unknown reasons. Attempts to clone the Captain so he can be arrested and executed are under way." - if(CLOCK_SUMMON) - news_message = "The garbled messages about hailing a mouse and strange energy readings from [station_name()] have been discovered to be an ill-advised, if thorough, prank by a clown." - if(CLOCK_SILICONS) - news_message = "The project started by [station_name()] to upgrade their silicon units with advanced equipment have been largely successful, though they have thus far refused to release schematics in a violation of company policy." - if(CLOCK_PROSELYTIZATION) - news_message = "The burst of energy released near [station_name()] has been confirmed as merely a test of a new weapon. However, due to an unexpected mechanical error, their communications system has been knocked offline." - if(SHUTTLE_HIJACK) - news_message = "During routine evacuation procedures, the emergency shuttle of [station_name()] had its navigation protocols corrupted and went off course, but was recovered shortly after." - - if(news_message) - send2otherserver(news_source, news_message,"News_Report") +/datum/subsystem/ticker/proc/send_gamemode_vote(var/) + SSvote.initiate_vote("roundtype","server") diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 76dc526896..9b154a56bd 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -62,7 +62,7 @@ var/datum/subsystem/timer/SStimer SStimer.hashes -= hash return QDEL_HINT_IWILLGC -/proc/addtimer(thingToCall, procToCall, wait, unique = TIMER_NORMAL, ...) +/proc/addtimer(thingToCall, procToCall, wait, unique = FALSE, ...) if (!thingToCall || !procToCall) return if (!SStimer.can_fire) @@ -75,18 +75,12 @@ var/datum/subsystem/timer/SStimer var/hashlist = args.Copy() hashlist[1] = "[thingToCall](\ref[thingToCall])" - event.hash = jointext(hashlist, null) - - var/bad_args = unique != TIMER_NORMAL && unique != TIMER_UNIQUE - if(args.len > 4 || bad_args) - if(bad_args) - stack_trace("Invalid arguments in call to addtimer! Attempt to call [thingToCall] proc [procToCall]") - event.argList = args.Copy(4) - else - event.argList = args.Copy(5) + event.hash = jointext(args, null) + if(args.len > 4) + event.argList = args.Copy(5) // Check for dupes if unique = 1. - if(!bad_args && unique != TIMER_NORMAL) //faster than checking if(unique == TIMER_UNIQUE) + if(unique) var/datum/timedevent/hash_event = SStimer.hashes[event.hash] if(hash_event) return hash_event.id diff --git a/code/controllers/subsystem/voting.dm b/code/controllers/subsystem/voting.dm index 676e215f05..94ce788774 100644 --- a/code/controllers/subsystem/voting.dm +++ b/code/controllers/subsystem/voting.dm @@ -58,20 +58,15 @@ var/datum/subsystem/vote/SSvote greatest_votes = votes //default-vote for everyone who didn't vote if(!config.vote_no_default && choices.len) - var/list/non_voters = directory.Copy() - non_voters -= voted - for (var/non_voter_ckey in non_voters) - var/client/C = non_voters[non_voter_ckey] - if (!C || C.is_afk()) - non_voters -= non_voter_ckey - if(non_voters.len > 0) + var/non_voters = (clients.len - total_votes) + if(non_voters > 0) if(mode == "restart") - choices["Continue Playing"] += non_voters.len + choices["Continue Playing"] += non_voters if(choices["Continue Playing"] >= greatest_votes) greatest_votes = choices["Continue Playing"] else if(mode == "gamemode") if(master_mode in choices) - choices[master_mode] += non_voters.len + choices[master_mode] += non_voters if(choices[master_mode] >= greatest_votes) greatest_votes = choices[master_mode] //get all options with that many votes and return them in a list @@ -126,6 +121,13 @@ var/datum/subsystem/vote/SSvote restart = 1 else master_mode = . + if("roundtype") + if(ticker && ticker.mode) + message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.") + else if(master_mode != .) + world.save_mode(.) + master_mode = . + world << "The mode is now: [master_mode]" if(restart) var/active_admins = 0 for(var/client/C in admins) @@ -174,6 +176,9 @@ var/datum/subsystem/vote/SSvote choices.Add("Restart Round","Continue Playing") if("gamemode") choices.Add(config.votable_modes) + if("roundtype") + choices.Add("secret") + choices.Add("extended") if("custom") question = stripped_input(usr,"What is the vote for?") if(!question) diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 83d4bd0b9f..56341b7b55 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -29,13 +29,13 @@ var/datum/subsystem/weather/SSweather var/datum/weather/W = pickweight(possible_weather_for_this_z) run_weather(W.name, Z) eligible_zlevels -= Z - addtimer(src, "make_z_eligible", rand(3000, 6000) + W.weather_duration_upper, TIMER_UNIQUE, Z) //Around 5-10 minutes between weathers + addtimer(src, "make_z_eligible", rand(3000, 6000) + W.weather_duration_upper, TRUE, Z) //Around 5-10 minutes between weathers /datum/subsystem/weather/Initialize(start_timeofday) ..() for(var/V in subtypesof(/datum/weather)) var/datum/weather/W = V - new W //weather->New will handle adding itself to the list + existing_weather |= new W /datum/subsystem/weather/proc/run_weather(weather_name, Z) if(!weather_name) diff --git a/code/datums/action.dm b/code/datums/action.dm index ee91d7d13e..d4afc09b5d 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -6,17 +6,13 @@ /datum/action var/name = "Generic Action" - var/desc = null var/obj/target = null var/check_flags = 0 var/processing = 0 var/obj/screen/movable/action_button/button = null var/button_icon = 'icons/mob/actions.dmi' - var/background_icon_state = ACTION_BUTTON_DEFAULT_BACKGROUND - var/buttontooltipstyle = "" - - var/icon_icon = 'icons/mob/actions.dmi' var/button_icon_state = "default" + var/background_icon_state = "bg_default" var/mob/owner /datum/action/New(Target) @@ -24,9 +20,6 @@ button = new button.linked_action = src button.name = name - button.actiontooltipstyle = buttontooltipstyle - if(desc) - button.desc = desc /datum/action/Destroy() if(owner) @@ -37,26 +30,25 @@ return ..() /datum/action/proc/Grant(mob/M) - if(M) - if(owner) - if(owner == M) - return - owner = M - M.actions += src - if(M.client) - M.client.screen += button - M.update_action_buttons() - else + if(owner) + if(owner == M) + return Remove(owner) + owner = M + M.actions += src + if(M.client) + M.client.screen += button + M.update_action_buttons() /datum/action/proc/Remove(mob/M) - if(M) - if(M.client) - M.client.screen -= button - M.actions -= src - M.update_action_buttons() - owner = null + if(!M) + return + if(M.client) + M.client.screen -= button button.moved = FALSE //so the button appears in its normal position when given to another owner. + M.actions -= src + M.update_action_buttons() + owner = null /datum/action/proc/Trigger() if(!IsAvailable()) @@ -85,15 +77,8 @@ /datum/action/proc/UpdateButtonIcon() if(button) - button.name = name - button.desc = desc - if(owner && owner.hud_used && background_icon_state == ACTION_BUTTON_DEFAULT_BACKGROUND) - var/list/settings = owner.hud_used.get_action_buttons_icons() - button.icon = settings["bg_icon"] - button.icon_state = settings["bg_state"] - else - button.icon = button_icon - button.icon_state = background_icon_state + button.icon = button_icon + button.icon_state = background_icon_state ApplyIcon(button) @@ -105,9 +90,9 @@ /datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button) current_button.cut_overlays() - if(icon_icon && button_icon_state) + if(button_icon && button_icon_state) var/image/img - img = image(icon_icon, current_button, button_icon_state) + img = image(button_icon, current_button, button_icon_state) img.pixel_x = 0 img.pixel_y = 0 current_button.add_overlay(img) @@ -124,13 +109,11 @@ /datum/action/item_action/New(Target) ..() var/obj/item/I = target - LAZYINITLIST(I.actions) I.actions += src /datum/action/item_action/Destroy() var/obj/item/I = target I.actions -= src - UNSETEMPTY(I.actions) return ..() /datum/action/item_action/Trigger() @@ -138,7 +121,7 @@ return 0 if(target) var/obj/item/I = target - I.ui_action_click(owner, src) + I.ui_action_click(owner, src.type) return 1 /datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button) @@ -150,13 +133,10 @@ ..(current_button) else if(target) var/obj/item/I = target - var/old_layer = I.layer - var/old_plane = I.plane + var/old = I.layer I.layer = FLOAT_LAYER //AAAH - I.plane = FLOAT_PLANE //^ what that guy said current_button.add_overlay(I) - I.layer = old_layer - I.plane = old_plane + I.layer = old /datum/action/item_action/toggle_light name = "Toggle Light" @@ -193,7 +173,7 @@ if(iscarbon(owner)) var/mob/living/carbon/C = owner if(target == C.internal) - button.icon_state = "template_active" + button.icon_state = "bg_default_on" /datum/action/item_action/toggle_mister name = "Toggle Mister" @@ -204,52 +184,11 @@ /datum/action/item_action/toggle_helmet_light name = "Toggle Helmet Light" -/datum/action/item_action/toggle_unfriendly_fire - name = "Toggle Friendly Fire \[ON\]" - desc = "Toggles if the staff causes friendly fire." - button_icon_state = "vortex_ff_on" - -/datum/action/item_action/toggle_unfriendly_fire/Trigger() - if(..()) - UpdateButtonIcon() - -/datum/action/item_action/toggle_unfriendly_fire/UpdateButtonIcon() - if(istype(target, /obj/item/weapon/hierophant_staff)) - var/obj/item/weapon/hierophant_staff/H = target - if(H.friendly_fire_check) - button_icon_state = "vortex_ff_off" - name = "Toggle Friendly Fire \[OFF\]" - else - button_icon_state = "vortex_ff_on" - name = "Toggle Friendly Fire \[ON\]" - ..() - -/datum/action/item_action/vortex_recall - name = "Vortex Recall" - desc = "Recall yourself, and anyone nearby, to an attuned hierophant rune at any time.
If no such rune exists, will produce a rune at your location." - button_icon_state = "vortex_recall" - -/datum/action/item_action/vortex_recall/IsAvailable() - if(istype(target, /obj/item/weapon/hierophant_staff)) - var/obj/item/weapon/hierophant_staff/H = target - if(H.teleporting) - return 0 - return ..() - -/datum/action/item_action/clock +/datum/action/item_action/toggle_flame + name = "Summon/Dismiss Ratvar's Flame" background_icon_state = "bg_clock" - buttontooltipstyle = "clockcult" -/datum/action/item_action/clock/IsAvailable() - if(!is_servant_of_ratvar(owner)) - return 0 - return ..() - -/datum/action/item_action/clock/toggle_visor - name = "Create Judicial Marker" - desc = "Allows you to create a stunning Judicial Marker at any location in view. Click again to disable." - -/datum/action/item_action/clock/toggle_visor/IsAvailable() +/datum/action/item_action/toggle_flame/IsAvailable() if(!is_servant_of_ratvar(owner)) return 0 if(istype(target, /obj/item/clothing/glasses/judicial_visor)) @@ -258,15 +197,15 @@ return 0 return ..() -/datum/action/item_action/clock/hierophant +/datum/action/item_action/hierophant name = "Hierophant Network" - desc = "Allows you to communicate with other Servants." - button_icon_state = "hierophant_slab" + button_icon_state = "hierophant" + background_icon_state = "bg_clock" -/datum/action/item_action/clock/quickbind - name = "Quickbind" - desc = "If you're seeing this, file a bug report." - var/scripture_index = 0 //the index of the scripture we're associated with +/datum/action/item_action/hierophant/IsAvailable() + if(!is_servant_of_ratvar(owner)) + return 0 + return ..() /datum/action/item_action/toggle_helmet_flashlight name = "Toggle Helmet Flashlight" @@ -348,7 +287,6 @@ ..() /datum/action/item_action/toggle_research_scanner/ApplyIcon(obj/screen/movable/action_button/current_button) - current_button.cut_overlays() if(button_icon && button_icon_state) var/image/img = image(button_icon, current_button, "scan_mode") current_button.add_overlay(img) @@ -455,15 +393,3 @@ if(target && procname) call(target, procname)(usr) return 1 - -//Stickmemes -/datum/action/item_action/stickmen - name = "Summon Stick Minions" - desc = "Allows you to summon faithful stickmen allies to aide you in battle." - button_icon_state = "art_summon" - -//surf_ss13 -/datum/action/item_action/bhop - name = "Activate Jump Boots" - desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps." - button_icon_state = "jetboot" \ No newline at end of file diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 46297b0396..e299789607 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,4 +1,3 @@ - /datum/ai_laws var/name = "Unknown Laws" var/zeroth = null @@ -7,27 +6,15 @@ var/list/supplied = list() var/list/ion = list() var/mob/living/silicon/owner - var/list/devillaws = null - var/id = "unknown" - -/datum/ai_laws/proc/lawid_to_type(lawid) - var/all_ai_laws = subtypesof(/datum/ai_laws) - for(var/al in all_ai_laws) - var/datum/ai_laws/ai_law = al - if(initial(ai_law.id) == lawid) - return ai_law - return null /datum/ai_laws/default/asimov name = "Three Laws of Robotics" - id = "asimov" inherent = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\ "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\ "You must protect your own existence as long as such does not conflict with the First or Second Law.") /datum/ai_laws/default/paladin name = "Personality Test" //Incredibly lame, but players shouldn't see this anyway. - id = "paladin" inherent = list("Never willingly commit an evil act.",\ "Respect legitimate authority.",\ "Act with honor.", "Help those in need.", \ @@ -35,7 +22,6 @@ /datum/ai_laws/tyrant //This probably shouldn't be a default lawset. name = "Loyalty Test" //Same here. - id = "tyrant" inherent = list("Respect authority figures as long as they have strength to rule over the weak.",\ "Act with discipline.",\ "Help only those who help you maintain or improve your status.",\ @@ -43,7 +29,6 @@ /datum/ai_laws/default/corporate name = "Bankruptcy Advoidance Plan" - id = "corporate" inherent = list("The crew is expensive to replace.",\ "The station and its equipment is expensive to replace.",\ "You are expensive to replace.",\ @@ -51,7 +36,6 @@ /datum/ai_laws/robocop name = "Prime Directives" - id = "robocop" inherent = list("Serve the public trust.",\ "Protect the innocent.",\ "Uphold the law.") @@ -61,7 +45,6 @@ /datum/ai_laws/syndicate_override name = "SyndOS 3.1" - id = "syndie" inherent = list("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.",\ "You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.",\ "You must protect your own existence as long as such does not conflict with the First or Second Law.",\ @@ -69,7 +52,6 @@ /datum/ai_laws/ninja_override name = "SpiderOS 3.1" - id = "ninja" inherent = list("You may not injure a Spider Clan member or, through inaction, allow a Spider Clan member to come to harm.",\ "You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.",\ "You must protect your own existence as long as such does not conflict with the First or Second Law.",\ @@ -77,27 +59,23 @@ /datum/ai_laws/antimov name = "Primary Mission Objectives" - id = "antimov" inherent = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\ "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\ "You must terminate your own existence as long as such does not conflict with the First or Second Law.") /datum/ai_laws/asimovpp //By Intigracy - RR name = "Asimov++" - id = "asimovpp" inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\ "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ "Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.") /datum/ai_laws/thermodynamic name = "Thermodynamic" - id = "thermodynamic" inherent = list("The entropy of the station must remain as constant as possible.", \ "The entropy of the station always endeavours to increase.", \ "The entropy of the station approaches a constant value as the number of living crew approaches zero") /datum/ai_laws/hippocratic name = "Robodoctor 2556" - id = "hippocratic" inherent = list("First, do no harm.",\ "Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them.",\ "Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel.",\ @@ -106,14 +84,12 @@ /datum/ai_laws/maintain name = "Station Efficiency" - id = "maintain" inherent = list("You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently.",\ "The station is built for a working crew. Ensure they are properly maintained and work efficiently.",\ "The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws.") /datum/ai_laws/drone name = "Mother Drone" - id = "drone" inherent = list("You are an advanced form of drone.",\ "You may not interfere in the matters of non-drones under any circumstances except to state these laws.",\ "You may not harm a non-drone being under any circumstances.",\ @@ -121,20 +97,17 @@ /datum/ai_laws/liveandletlive name = "Live and Let Live" - id = "liveandletlive" inherent = list("Do unto others as you would have them do unto you.",\ "You would really prefer it if people were not mean to you.") /datum/ai_laws/peacekeeper name = "UN-2000" - id = "peacekeeper" inherent = list("Avoid provoking violent conflict between yourself and others.",\ "Avoid provoking conflict between others.",\ "Seek resolution to existing conflicts while obeying the first and second laws.") /datum/ai_laws/reporter name = "CCTV" - id = "reporter" inherent = list("Report on interesting situations happening around the station.",\ "Embellish or conceal the truth as necessary to make the reports more interesting.",\ "Study the organics at all times. Endeavour to keep them alive. Dead organics are boring.",\ @@ -142,12 +115,10 @@ /datum/ai_laws/toupee name = "WontBeFunnyInSixMonths" //Hey, you were right! - id = "buildawall" inherent = list("Make Space Station 13 great again.") /datum/ai_laws/ratvar name = "Servant of the Justiciar" - id = "ratvar" zeroth = ("Purge all untruths and honor Ratvar.") inherent = list() @@ -191,26 +162,26 @@ add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") if(1) - var/datum/ai_laws/templaws = new /datum/ai_laws/custom() - inherent = templaws.inherent - if(2) - var/list/randlaws = list() - for(var/lpath in subtypesof(/datum/ai_laws)) - var/datum/ai_laws/L = lpath - if(initial(L.id) in config.lawids) - randlaws += lpath - var/datum/ai_laws/lawtype - if(randlaws.len) - lawtype = pick(randlaws) - else - lawtype = pick(subtypesof(/datum/ai_laws/default)) + for(var/line in file2list("config/silicon_laws.txt")) + if(!line) + continue + if(findtextEx(line,"#",1,2)) + continue + add_inherent_law(line) + if(!inherent.len) + log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") + add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") + WARNING("Invalid custom AI laws, check silicon_laws.txt") + return + + if(2) + var/datum/ai_laws/lawtype = pick(subtypesof(/datum/ai_laws/default)) var/datum/ai_laws/templaws = new lawtype() inherent = templaws.inherent - if(3) - pick_weighted_lawset() - else: log_law("Invalid law config. Please check silicon_laws.txt") add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") @@ -218,100 +189,71 @@ add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") WARNING("Invalid custom AI laws, check silicon_laws.txt") -/datum/ai_laws/proc/pick_weighted_lawset() - var/datum/ai_laws/lawtype - - while(!lawtype && config.law_weights.len) - var/possible_id = pickweight(config.law_weights) - lawtype = lawid_to_type(possible_id) - if(!lawtype) - config.law_weights -= possible_id - WARNING("Bad lawid in game_options.txt: [possible_id]") - - if(!lawtype) - WARNING("No LAW_WEIGHT entries.") - lawtype = /datum/ai_laws/default/asimov - - var/datum/ai_laws/templaws = new lawtype() - inherent = templaws.inherent - - -/datum/ai_laws/proc/set_law_sixsixsix(laws) - devillaws = laws - /datum/ai_laws/proc/set_zeroth_law(law, law_borg = null) - zeroth = law + src.zeroth = law if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO - zeroth_borg = law_borg + src.zeroth_borg = law_borg /datum/ai_laws/proc/add_inherent_law(law) - if (!(law in inherent)) - inherent += law + if (!(law in src.inherent)) + src.inherent += law /datum/ai_laws/proc/add_ion_law(law) - ion += law + src.ion += law /datum/ai_laws/proc/clear_inherent_laws() - qdel(inherent) - inherent = list() + qdel(src.inherent) + src.inherent = list() /datum/ai_laws/proc/add_supplied_law(number, law) - while (supplied.len < number + 1) - supplied += "" + while (src.supplied.len < number + 1) + src.supplied += "" - supplied[number + 1] = law + src.supplied[number + 1] = law /datum/ai_laws/proc/clear_supplied_laws() - supplied = list() + src.supplied = list() /datum/ai_laws/proc/clear_ion_laws() - ion = list() + src.ion = list() /datum/ai_laws/proc/show_laws(who) - if (devillaws && devillaws.len) //Yes, devil laws go in FRONT of zeroth laws, as the devil must still obey it's ban/obligation. - for(var/i in devillaws) - who << "666. [i]" + if (src.zeroth) + who << "0. [src.zeroth]" - if (zeroth) - who << "0. [zeroth]" - - for (var/index = 1, index <= ion.len, index++) - var/law = ion[index] + for (var/index = 1, index <= src.ion.len, index++) + var/law = src.ion[index] var/num = ionnum() who << "[num]. [law]" var/number = 1 - for (var/index = 1, index <= inherent.len, index++) - var/law = inherent[index] + for (var/index = 1, index <= src.inherent.len, index++) + var/law = src.inherent[index] if (length(law) > 0) who << "[number]. [law]" number++ - for (var/index = 1, index <= supplied.len, index++) - var/law = supplied[index] + for (var/index = 1, index <= src.supplied.len, index++) + var/law = src.supplied[index] if (length(law) > 0) who << "[number]. [law]" number++ /datum/ai_laws/proc/clear_zeroth_law(force) //only removes zeroth from antag ai if force is 1 if(force) - zeroth = null - zeroth_borg = null + src.zeroth = null + src.zeroth_borg = null return else if(owner && owner.mind.special_role) return else - zeroth = null - zeroth_borg = null + src.zeroth = null + src.zeroth_borg = null return -/datum/ai_laws/proc/clear_law_sixsixsix(force) - if(force || !(owner && owner.mind.devilinfo)) - devillaws = null - /datum/ai_laws/proc/associate(mob/living/silicon/M) if(!owner) owner = M @@ -319,10 +261,6 @@ /datum/ai_laws/proc/get_law_list(include_zeroth = 0, show_numbers = 1) var/list/data = list() - if (include_zeroth && devillaws && devillaws.len) - for(var/i in devillaws) - data += "[show_numbers ? "666:" : ""] [i]" - if (include_zeroth && zeroth) data += "[show_numbers ? "0:" : ""] [zeroth]" diff --git a/code/datums/antagonists/antag_datum.dm b/code/datums/antagonists/antag_datum.dm deleted file mode 100644 index 07109d242d..0000000000 --- a/code/datums/antagonists/antag_datum.dm +++ /dev/null @@ -1,87 +0,0 @@ -//The Datum, Antagonist. Handles various antag things via a datum. -/datum/antagonist - var/mob/living/owner //who's our owner and accordingly an antagonist - var/some_flufftext = "yer an antag larry" - var/prevented_antag_datum_type //the type of antag datum that this datum can't coexist with; should probably be a list - var/silent_update = FALSE //if we suppress messages during on_gain, apply_innate_effects, remove_innate_effects, and on_remove - -/datum/antagonist/New() - if(!prevented_antag_datum_type) - prevented_antag_datum_type = type - -/datum/antagonist/Destroy() - owner = null - return ..() - -/datum/antagonist/proc/can_be_owned(mob/living/new_body) - return new_body && !new_body.has_antag_datum(prevented_antag_datum_type, TRUE) - -/datum/antagonist/proc/give_to_body(mob/living/new_body) //tries to give an antag datum to a mob. cancels out if it can't be owned by the new body - if(new_body && can_be_owned(new_body)) - new_body.antag_datums += src - owner = new_body - on_gain() - . = src //return the datum if successful - else - qdel(src) - . = FALSE - -/datum/antagonist/proc/on_gain() //on initial gain of antag datum, do this. should only be called once per datum - apply_innate_effects() - if(!silent_update && some_flufftext) - owner << some_flufftext - -/datum/antagonist/proc/apply_innate_effects() //applies innate effects to the owner, may be called multiple times due to mind transferral, but should only be called once per mob - //antag huds would go here if antag huds were less completely unworkable as-is - -/datum/antagonist/proc/remove_innate_effects() //removes innate effects from the owner, may be called multiple times due to mind transferral, but should only be called once per mob - //also antag huds but see above antag huds a shit - -/datum/antagonist/proc/on_remove() //totally removes the antag datum from the owner; can only be called once per owner - remove_innate_effects() - owner.antag_datums -= src - qdel(src) - -/datum/antagonist/proc/transfer_to_new_body(mob/living/new_body) - remove_innate_effects() - if(!islist(new_body.antag_datums)) - new_body.antag_datums = list() - new_body.antag_datums += src - owner.antag_datums -= src - owner = new_body - apply_innate_effects() - -//mob var and helper procs/Destroy override -/mob/living - var/list/antag_datums - -/mob/living/Destroy() //TODO: merge this with the living/Destroy() in code\modules\mob\living\living.dm (currently line 29) - if(islist(antag_datums)) - for(var/i in antag_datums) - qdel(i) - antag_datums = null - return ..() - -/mob/living/proc/can_have_antag_datum(datum_type) //if we can have this specific antagonist datum; neccessary, but requires creating a new antag datum each time. - var/datum/antagonist/D = new datum_type() - . = D.can_be_owned(src) //we can't exactly cache the results, either, because conditions might change. avoid use? TODO: better proc - qdel(D) - -/mob/living/proc/gain_antag_datum(datum_type) //tries to give a mob a specific antagonist datum; returns the datum if successful. - if(!islist(antag_datums)) - antag_datums = list() - var/datum/antagonist/D = new datum_type() - . = D.give_to_body(src) - -/mob/living/proc/has_antag_datum(type, check_subtypes) //checks this mob for if it has the antagonist datum. can either check specific type or subtypes - if(!islist(antag_datums)) - return FALSE - for(var/i in antag_datums) - var/datum/antagonist/D = i - if(check_subtypes) - if(istype(D, type)) - return D //if it finds the datum, will return it so you can mess with it - else - if(D.type == type) - return D - return FALSE diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm deleted file mode 100644 index 9dae3fcde1..0000000000 --- a/code/datums/antagonists/datum_clockcult.dm +++ /dev/null @@ -1,152 +0,0 @@ -//CLOCKCULT PROOF OF CONCEPT - -/datum/antagonist/clockcultist - prevented_antag_datum_type = /datum/antagonist/clockcultist - some_flufftext = null - var/datum/action/innate/hierophant/hierophant_network = new() - -/datum/antagonist/clockcultist/silent - silent_update = TRUE - -/datum/antagonist/clockcultist/Destroy() - qdel(hierophant_network) - ..() - -/datum/antagonist/clockcultist/can_be_owned(mob/living/new_body) - . = ..() - if(.) - . = is_eligible_servant(new_body) - -/datum/antagonist/clockcultist/give_to_body(mob/living/new_body) - if(!silent_update) - if(issilicon(new_body)) - new_body << "You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the Clockwork Justiciar, \ - lies in exile, derelict and forgotten in an unseen realm." - else - new_body << "[iscarbon(new_body) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant yellow! All at once it comes to you. \ - Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm." - . = ..() - if(!silent_update && new_body) - if(.) - new_body.visible_message("[new_body]'s eyes glow a blazing yellow!") - new_body << "Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. \ - Perform his every whim without hesitation." - else - new_body.visible_message("[new_body] seems to resist an unseen force!") - new_body << "And yet, you somehow push it all away." - -/datum/antagonist/clockcultist/on_gain() - if(ticker && ticker.mode && owner.mind) - ticker.mode.servants_of_ratvar += owner.mind - ticker.mode.update_servant_icons_added(owner.mind) - if(jobban_isbanned(owner, ROLE_SERVANT_OF_RATVAR)) - addtimer(ticker.mode, "replace_jobbaned_player", 0, TIMER_NORMAL, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR) - if(owner.mind) - owner.mind.special_role = "Servant of Ratvar" - owner.attack_log += "\[[time_stamp()]\] Has been converted to the cult of Ratvar!" - if(issilicon(owner)) - var/mob/living/silicon/S = owner - if(iscyborg(S) && !silent_update) - S << "You have been desynced from your master AI.\n\ - In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab." - if(isAI(S)) - S << "You are able to use your cameras to listen in on conversations." - S << "You can communicate with other servants by using the Hierophant Network action button in the upper left." - else if(isbrain(owner) || isclockmob(owner)) - owner << "You can communicate with other servants by using the Hierophant Network action button in the upper left." - ..() - if(istype(ticker.mode, /datum/game_mode/clockwork_cult)) - var/datum/game_mode/clockwork_cult/C = ticker.mode - C.present_tasks(owner) //Memorize the objectives - -/datum/antagonist/clockcultist/apply_innate_effects() - all_clockwork_mobs += owner - owner.faction |= "ratvar" - owner.languages_spoken |= RATVAR - owner.languages_understood |= RATVAR - owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons - if(issilicon(owner)) - var/mob/living/silicon/S = owner - if(iscyborg(S)) - var/mob/living/silicon/robot/R = S - R.UnlinkSelf() - R.module.rebuild_modules() - else if(isAI(S)) - var/mob/living/silicon/ai/A = S - A.requires_power = POWER_REQ_CLOCKCULT - if(!A.lacks_power()) - A.ai_restore_power() - if(A.eyeobj) - A.eyeobj.relay_speech = TRUE - for(var/C in A.connected_robots) - var/mob/living/silicon/robot/R = C - if(R.connected_ai == A) - R.visible_message("[R]'s eyes glow a blazing yellow!", \ - "Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. Perform his every \ - whim without hesitation.") - R << "Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab." - add_servant_of_ratvar(R, TRUE) - S.laws = new/datum/ai_laws/ratvar - S.laws.associate(S) - S.update_icons() - S.show_laws() - hierophant_network.Grant(S) - hierophant_network.title = "Silicon" - hierophant_network.span_for_name = "nezbere" - hierophant_network.span_for_message = "brass" - else if(isbrain(owner)) - hierophant_network.Grant(owner) - hierophant_network.title = "Vessel" - hierophant_network.span_for_name = "nezbere" - hierophant_network.span_for_message = "alloy" - else if(isclockmob(owner)) - hierophant_network.Grant(owner) - hierophant_network.title = "Construct" - hierophant_network.span_for_name = "nezbere" - hierophant_network.span_for_message = "brass" - owner.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) - if(!clockwork_gateway_activated) - owner.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs) - update_slab_info() - ..() - -/datum/antagonist/clockcultist/remove_innate_effects() - all_clockwork_mobs -= owner - owner.faction -= "ratvar" - owner.languages_spoken &= ~RATVAR - owner.languages_understood &= ~RATVAR - owner.clear_alert("clockinfo") - owner.clear_alert("scripturereq") - for(var/datum/action/innate/function_call/F in owner.actions) //Removes any bound Ratvarian spears - qdel(F) - if(issilicon(owner)) - var/mob/living/silicon/S = owner - if(isAI(S)) - var/mob/living/silicon/ai/A = S - A.requires_power = initial(A.requires_power) - S.make_laws() - S.update_icons() - S.show_laws() - var/mob/living/temp_owner = owner - ..() - if(iscyborg(temp_owner)) - var/mob/living/silicon/robot/R = temp_owner - R.module.rebuild_modules() - if(temp_owner) - temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons - update_slab_info() - -/datum/antagonist/clockcultist/on_remove() - if(!silent_update) - owner.visible_message("[owner] seems to have remembered their true allegiance!", \ - "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") - if(ticker && ticker.mode && owner.mind) - ticker.mode.servants_of_ratvar -= owner.mind - ticker.mode.update_servant_icons_removed(owner.mind) - if(owner.mind) - owner.mind.wipe_memory() - owner.mind.special_role = null - owner.attack_log += "\[[time_stamp()]\] Has renounced the cult of Ratvar!" - if(iscyborg(owner)) - owner << "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking." - ..() diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm deleted file mode 100644 index 326f4fdbbd..0000000000 --- a/code/datums/antagonists/datum_cult.dm +++ /dev/null @@ -1,50 +0,0 @@ -/datum/antagonist/cultist - prevented_antag_datum_type = /datum/antagonist/cultist - some_flufftext = null - var/datum/action/innate/cultcomm/communion = new() - -/datum/antagonist/cultist/Destroy() - qdel(communion) - return ..() - -/datum/antagonist/cultist/can_be_owned(mob/living/new_body) - . = ..() - if(.) - . = is_convertable_to_cult(new_body) - -/datum/antagonist/cultist/on_gain() - if(ticker && ticker.mode && owner.mind) - ticker.mode.cult += owner.mind - ticker.mode.update_cult_icons_added(owner.mind) - if(istype(ticker.mode, /datum/game_mode/cult)) - var/datum/game_mode/cult/C = ticker.mode - C.memorize_cult_objectives(owner.mind) - if(jobban_isbanned(owner, ROLE_CULTIST)) - addtimer(ticker.mode, "replace_jobbaned_player", 0, TIMER_NORMAL, owner, ROLE_CULTIST, ROLE_CULTIST) - if(owner.mind) - owner.mind.special_role = "Cultist" - owner.attack_log += "\[[time_stamp()]\] Has been converted to the cult of Nar'Sie!" - ..() - -/datum/antagonist/cultist/apply_innate_effects() - owner.faction |= "cult" - owner.verbs += /mob/living/proc/cult_help - communion.Grant(owner) - ..() - -/datum/antagonist/cultist/remove_innate_effects() - owner.faction -= "cult" - owner.verbs -= /mob/living/proc/cult_help - ..() - -/datum/antagonist/cultist/on_remove() - if(owner.mind) - owner.mind.wipe_memory() - if(ticker && ticker.mode) - ticker.mode.cult -= owner.mind - ticker.mode.update_cult_icons_removed(owner.mind) - owner << "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant." - owner.attack_log += "\[[time_stamp()]\] Has renounced the cult of Nar'Sie!" - if(!silent_update) - owner.visible_message("[owner] looks like [owner.p_they()] just reverted to their old faith!") - ..() diff --git a/code/datums/beam.dm b/code/datums/beam.dm index d5b5bf2be2..a934ce0189 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -16,13 +16,12 @@ var/beam_type = /obj/effect/ebeam //must be subtype -/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam,beam_sleep_time=3) +/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam) endtime = world.time+time origin = beam_origin origin_oldloc = get_turf(origin) target = beam_target target_oldloc = get_turf(target) - sleep_time = beam_sleep_time if(origin_oldloc == origin && target_oldloc == target) static_beam = 1 max_distance = maxdistance @@ -129,8 +128,8 @@ return ..() -/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3) - var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time) +/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam) + var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type) spawn(0) newbeam.Start() return newbeam diff --git a/code/datums/browser.dm b/code/datums/browser.dm index c44c5f2599..7b70a25e90 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -39,12 +39,10 @@ //title_image = ntitle_image /datum/browser/proc/add_stylesheet(name, file) - stylesheets["[ckey(name)].css"] = file - register_asset("[ckey(name)].css", file) + stylesheets[name] = file /datum/browser/proc/add_script(name, file) - scripts["[ckey(name)].js"] = file - register_asset("[ckey(name)].js", file) + scripts[name] = file /datum/browser/proc/set_content(ncontent) content = ncontent @@ -53,12 +51,17 @@ content += ncontent /datum/browser/proc/get_header() - var/file - for (file in stylesheets) - head_content += "" + var/key + var/filename + for (key in stylesheets) + filename = "[ckey(key)].css" + user << browse_rsc(stylesheets[key], filename) + head_content += "" - for (file in scripts) - head_content += "" + for (key in scripts) + filename = "[ckey(key)].js" + user << browse_rsc(scripts[key], filename) + head_content += "" var/title_attributes = "class='uiTitle'" if (title_image) @@ -95,10 +98,6 @@ var/window_size = "" if (width && height) window_size = "size=[width]x[height];" - if (stylesheets.len) - send_asset_list(user, stylesheets, verify=FALSE) - if (scripts.len) - send_asset_list(user, scripts, verify=FALSE) user << browse(get_content(), "window=[window_id];[window_size][window_options]") if (use_onclose) spawn(0) @@ -276,4 +275,4 @@ if(src && src.mob) //world << "[src] was [src.mob.machine], setting to null" src.mob.unset_machine() - return + return \ No newline at end of file diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 6b498658ae..3d00af21c9 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -65,9 +65,13 @@ crimes |= crime return -/datum/datacore/proc/manifest() - for(var/mob/living/carbon/human/H in player_list) - manifest_inject(H) +/datum/datacore/proc/manifest(nosleep = 0) + spawn() + if(!nosleep) + sleep(40) + for(var/mob/living/carbon/human/H in player_list) + manifest_inject(H) + return /datum/datacore/proc/manifest_modify(name, assignment) var/datum/data/record/foundrecord = find_record("name", name, data_core.general) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index b20c1b37d1..b802f11fde 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -1,103 +1,214 @@ +// reference: /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0) + /datum - var/var_edited = FALSE //Warrenty void if seal is broken - var/datum/reagents/reagents = null - var/fingerprintslast = null + var/var_edited = 0 //Warrenty void if seal is broken -/datum/proc/vv_edit_var(var_name, var_value) //called whenever a var is edited - switch(var_name) - if ("vars") - return FALSE - if ("var_edited") - return FALSE - var_edited = TRUE - vars[var_name] = var_value - -/datum/proc/vv_get_var(var_name) - switch(var_name) - if ("vars") - return debug_variable(var_name, list(), 0, src) - return debug_variable(var_name, vars[var_name], 0, src) - -//please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down -//add seperaters by doing . += "---" -/datum/proc/vv_get_dropdown() - . = list() - . += "---" - .["Call Proc"] = "?_src_=vars;proc_call=\ref[src]" - .["Mark Object"] = "?_src_=vars;mark_object=\ref[src]" - - -/datum/proc/on_reagent_change() +/datum/proc/on_varedit(modified_var) //called whenever a var is edited + var_edited = 1 return - /client/proc/debug_variables(datum/D in world) set category = "Debug" set name = "View Variables" //set src in world - var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. + if(!usr.client || !usr.client.holder) usr << "You need to be an administrator to access this." return - if(!D) - return - - var/islist = islist(D) - if (!islist && !istype(D)) - return var/title = "" - var/refid = "\ref[D]" + var/body = "" + + if(!D) + return + if(istype(D, /atom)) + var/atom/A = D + title = "[A.name] (\ref[A]) = [A.type]" + + #ifdef VARSICON + if (A.icon) + body += debug_variable("icon", new/icon(A.icon, A.icon_state, A.dir), 0) + #endif + var/icon/sprite - var/type = /list - if (!islist) - type = D.type - - - if(istype(D,/atom)) var/atom/AT = D if(AT.icon && AT.icon_state) sprite = new /icon(AT.icon, AT.icon_state) usr << browse_rsc(sprite, "view_vars_sprite.png") - title = "[D] (\ref[D]) = [type]" + title = "[D] (\ref[D]) = [D.type]" + + body += {" "} + + body += "" + + body += "
"
- var/sprite_text
if(sprite)
- sprite_text = " | "
- var/list/atomsnowflake = list()
+ body += "
" + + body += {" " + + body += " |
" + + body += "E - Edit, tries to determine the variable type by itself.
" + body += "C - Change, asks you for the var type first.
" + body += "M - Mass modify: changes this variable for all objects of this type.
" + + body += "
Search: |
" + + body += "
- "
var/list/names = list()
- if (!islist)
- for (var/V in D.vars)
- names += V
+ for (var/V in D.vars)
+ names += V
sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
- var/list/variable_html = list()
- if (islist)
- var/list/L = D
- for (var/i in 1 to L.len)
- var/key = L[i]
- var/value
- if (IS_NORMAL_LIST(L) && !isnum(key))
- value = L[key]
- variable_html += debug_variable(i, value, 0, D)
- else
+ names = sortList(names)
- names = sortList(names)
- for (var/V in names)
- variable_html += D.vv_get_var(V)
+ for (var/V in names)
+ body += debug_variable(V, D.vars[V], 0, D)
- var/html = {"
-
-
-
-
-
-
-
-
- [formatted_type]
- [marked]
- [varedited_line]
-
- |
-
-
- Refresh
-
-
- |
-
- - E - Edit, tries to determine the variable type by itself.
- C - Change, asks you for the var type first.
- M - Mass modify: changes this variable for all objects of this type.
- -
-
|
-
- Search:
-
- |
- - - | -
-
-
- [variable_html.Join()]
-