From 76e1ee80b762f3e66dd48eda81ae61adb60e5444 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 3 May 2020 07:12:41 +0200
Subject: [PATCH 01/23] Porting "Mobs now turn towards and are shifted based on
grab state towards something pulling them"
---
code/__DEFINES/atmospherics.dm | 4 +-
code/__DEFINES/mobs.dm | 4 ++
code/datums/components/riding.dm | 7 ++++
code/game/atoms_movable.dm | 4 ++
code/game/atoms_movement.dm | 18 +++-----
code/game/objects/buckling.dm | 11 ++++-
.../atmospherics/machinery/pipes/manifold.dm | 2 +
.../machinery/pipes/manifold4w.dm | 2 +
code/modules/mob/living/living.dm | 41 +++++++++++++++++++
code/modules/mob/living/living_defense.dm | 1 +
code/modules/mob/living/living_movement.dm | 14 ++++++-
code/modules/mob/mob_movement.dm | 2 +
12 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index e728d49956..88c1b763a5 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -255,10 +255,10 @@
//HELPERS
#define PIPING_LAYER_SHIFT(T, PipingLayer) \
- if(T.dir & NORTH || T.dir & SOUTH) { \
+ if(T.dir & (NORTH|SOUTH)) { \
T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\
} \
- if(T.dir & WEST || T.dir & EAST) { \
+ if(T.dir & (WEST|EAST)) { \
T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;\
}
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index c89bd4843e..61850ed2fd 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -288,6 +288,10 @@
#define HUMAN_FIRE_STACK_ICON_NUM 3
+#define GRAB_PIXEL_SHIFT_PASSIVE 6
+#define GRAB_PIXEL_SHIFT_AGGRESSIVE 12
+#define GRAB_PIXEL_SHIFT_NECK 16
+
#define PULL_PRONE_SLOWDOWN 0.6
#define FIREMAN_CARRY_SLOWDOWN 0
#define PIGGYBACK_CARRY_SLOWDOWN 1
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 00bb392787..651acda6e1 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -20,6 +20,8 @@
var/ride_check_ridden_incapacitated = FALSE
var/list/offhands = list() // keyed list containing all the current riding offsets associated by mob
+ var/del_on_unbuckle_all = FALSE
+
/datum/component/riding/Initialize()
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
@@ -28,8 +30,11 @@
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
/datum/component/riding/proc/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
+ var/atom/movable/AM = parent
restore_position(M)
unequip_buckle_inhands(M)
+ if(del_on_unbuckle_all && !AM.has_buckled_mobs())
+ qdel(src)
/datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE)
handle_vehicle_offsets()
@@ -194,6 +199,7 @@
///////Yes, I said humans. No, this won't end well...//////////
/datum/component/riding/human
+ del_on_unbuckle_all = TRUE
var/fireman_carrying = FALSE
/datum/component/riding/human/Initialize()
@@ -261,6 +267,7 @@
user.visible_message("[AM] pushes [user] off of [AM.p_them()]!")
/datum/component/riding/cyborg
+ del_on_unbuckle_all = TRUE
/datum/component/riding/cyborg/Initialize()
. = ..()
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b86c7e9729..32dde45195 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -25,6 +25,7 @@
var/inertia_move_delay = 5
var/pass_flags = 0
var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
+ var/atom/movable/moving_from_pull //attempt to resume grab after moving instead of before.
var/list/client_mobs_in_contents // This contains all the client mobs within this container
var/list/acted_explosions //for explosion dodging
glide_size = 8
@@ -207,6 +208,7 @@
if(!Process_Spacemove(get_dir(pulling.loc, A)))
return
step(pulling, get_dir(pulling.loc, A))
+ return TRUE
/atom/movable/proc/check_pulling()
if(pulling)
@@ -224,6 +226,8 @@
if(pulling.anchored || pulling.move_resist > move_force)
stop_pulling()
return
+ if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move.
+ pulledby.stop_pulling()
/atom/movable/Destroy(force)
QDEL_NULL(proximity_monitor)
diff --git a/code/game/atoms_movement.dm b/code/game/atoms_movement.dm
index d418652cd8..3d2b6d9e91 100644
--- a/code/game/atoms_movement.dm
+++ b/code/game/atoms_movement.dm
@@ -51,13 +51,8 @@
/atom/movable/Move(atom/newloc, direct)
var/atom/movable/pullee = pulling
var/turf/T = loc
- if(pulling)
- if(pullee && get_dist(src, pullee) > 1)
- stop_pulling()
-
- if(pullee && pullee.loc != loc && !isturf(pullee.loc) ) //to be removed once all code that changes an object's loc uses forceMove().
- log_game("DEBUG:[src]'s pull on [pullee] wasn't broken despite [pullee] being in [pullee.loc]. Pull stopped manually.")
- stop_pulling()
+ if(!moving_from_pull)
+ check_pulling()
if(!loc || !newloc)
return FALSE
var/atom/oldloc = loc
@@ -130,19 +125,16 @@
if(has_buckled_mobs() && !handle_buckled_mob_movement(loc,direct)) //movement failed due to buckled mob(s)
return FALSE
- if(pulling && pulling == pullee) //we were pulling a thing and didn't lose it during our move.
+ if(pulling && pulling == pullee && pulling != moving_from_pull) //we were pulling a thing and didn't lose it during our move.
if(pulling.anchored)
stop_pulling()
else
var/pull_dir = get_dir(src, pulling)
//puller and pullee more than one tile away or in diagonal position
if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir)))
+ pulling.moving_from_pull = src
pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position
- if(pulling && get_dist(src, pulling) > 1) //the pullee couldn't keep up
- stop_pulling()
- if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)//separated from our puller and not in the middle of a diagonal move.
- pulledby.stop_pulling()
-
+ pulling.moving_from_pull = null
Moved(oldloc, direct)
/atom/movable/proc/handle_buckled_mob_movement(newloc,direct)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 0e14af75a9..bacb8c6669 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -55,8 +55,12 @@
M.buckling = null
return FALSE
- if(M.pulledby && buckle_prevents_pull)
- M.pulledby.stop_pulling()
+ if(M.pulledby)
+ if(buckle_prevents_pull)
+ M.pulledby.stop_pulling()
+ else if(isliving(M.pulledby))
+ var/mob/living/L = M.pulledby
+ L.reset_pull_offsets(M, TRUE)
if(!check_loc && M.loc != loc)
M.forceMove(loc)
@@ -137,4 +141,7 @@
"You unbuckle yourself from [src].",\
"You hear metal clanking.")
add_fingerprint(user)
+ if(isliving(M.pulledby))
+ var/mob/living/L = M.pulledby
+ L.set_pull_offsets(M, L.grab_state)
return M
diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
index 77452fd6fd..aa8ee65bd8 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -28,6 +28,8 @@
/obj/machinery/atmospherics/pipe/manifold/update_icon()
cut_overlays()
+ if(!center)
+ center = mutable_appearance(icon, "manifold_center")
PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
add_overlay(center)
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
index 1bcca8d5ae..56c0408d18 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -26,6 +26,8 @@
/obj/machinery/atmospherics/pipe/manifold4w/update_icon()
cut_overlays()
+ if(!center)
+ center = mutable_appearance(icon, "manifold_center")
PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
add_overlay(center)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 89f8381087..5189f47fbc 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -316,6 +316,45 @@
update_pull_movespeed()
+ set_pull_offsets(M, state)
+
+/mob/living/proc/set_pull_offsets(mob/living/M, grab_state = GRAB_PASSIVE)
+ if(M.buckled)
+ return //don't make them change direction or offset them if they're buckled into something.
+ var/offset = 0
+ switch(grab_state)
+ if(GRAB_PASSIVE)
+ offset = GRAB_PIXEL_SHIFT_PASSIVE
+ if(GRAB_AGGRESSIVE)
+ offset = GRAB_PIXEL_SHIFT_AGGRESSIVE
+ if(GRAB_NECK)
+ offset = GRAB_PIXEL_SHIFT_NECK
+ if(GRAB_KILL)
+ offset = GRAB_PIXEL_SHIFT_NECK
+ M.setDir(get_dir(M, src))
+ switch(M.dir)
+ if(NORTH)
+ animate(M, pixel_x = 0, pixel_y = offset, 3)
+ if(SOUTH)
+ animate(M, pixel_x = 0, pixel_y = -offset, 3)
+ if(EAST)
+ if(M.lying == 270) //update the dragged dude's direction if we've turned
+ M.lying = 90
+ M.update_transform() //force a transformation update, otherwise it'll take a few ticks for update_mobility() to do so
+ M.lying_prev = M.lying
+ animate(M, pixel_x = offset, pixel_y = 0, 3)
+ if(WEST)
+ if(M.lying == 90)
+ M.lying = 270
+ M.update_transform()
+ M.lying_prev = M.lying
+ animate(M, pixel_x = -offset, pixel_y = 0, 3)
+
+/mob/living/proc/reset_pull_offsets(mob/living/M, override)
+ if(!override && M.buckled)
+ return
+ animate(M, pixel_x = 0, pixel_y = 0, 1)
+
//mob verbs are a lot faster than object verbs
//for more info on why this is not atom/pull, see examinate() in mob.dm
/mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1))
@@ -328,6 +367,8 @@
stop_pulling()
/mob/living/stop_pulling()
+ if(ismob(pulling))
+ reset_pull_offsets(pulling)
..()
update_pull_movespeed()
update_pull_hud_icon()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 39a94232a3..3e4fbd9625 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -264,6 +264,7 @@
update_mobility() //we fall down
if(!buckled && !density)
Move(user.loc)
+ user.set_pull_offsets(src, grab_state)
return 1
/mob/living/attack_hand(mob/user)
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index ddcf3e6292..6a84162ea8 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -75,8 +75,12 @@
. = ..()
- if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)//separated from our puller and not in the middle of a diagonal move.
+ if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1 && (pulledby != moving_from_pull))//separated from our puller and not in the middle of a diagonal move.
pulledby.stop_pulling()
+ else
+ if(isliving(pulledby))
+ var/mob/living/L = pulledby
+ L.set_pull_offsets(src, pulledby.grab_state)
if(active_storage && !(CanReach(active_storage.parent,view_only = TRUE)))
active_storage.close(src)
@@ -84,6 +88,14 @@
if(lying && !buckled && prob(getBruteLoss()*200/maxHealth))
makeTrail(newloc, T, old_direction)
+
+/mob/living/Move_Pulled(atom/A)
+ . = ..()
+ if(!. || !isliving(A))
+ return
+ var/mob/living/L = A
+ set_pull_offsets(L, grab_state)
+
/mob/living/forceMove(atom/destination)
stop_pulling()
if(buckled)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index fdc60b30cb..adf3e349b7 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -109,6 +109,8 @@
/// Process_Grab(): checks for grab, attempts to break if so. Return TRUE to prevent movement.
/client/proc/Process_Grab()
if(mob.pulledby)
+ if((mob.pulledby == mob.pulling) && (mob.pulledby.grab_state == GRAB_PASSIVE)) //Don't autoresist passive grabs if we're grabbing them too.
+ return
if(mob.incapacitated(ignore_restraints = 1))
move_delay = world.time + 10
return TRUE
From 65899bf90668d98a020fee8261572da293107ba3 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 3 May 2020 19:56:00 +0200
Subject: [PATCH 02/23] Removing cargo "paperwork" and a few other bloat packs.
---
.../crafting/recipes/recipes_misc.dm | 9 -------
code/game/objects/structures/loom.dm | 3 ---
code/modules/cargo/exports/manifest.dm | 16 -----------
code/modules/cargo/packs/materials.dm | 8 ------
code/modules/cargo/packs/misc.dm | 27 +------------------
5 files changed, 1 insertion(+), 62 deletions(-)
diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm
index 9eb3fcaaea..cca1682723 100644
--- a/code/datums/components/crafting/recipes/recipes_misc.dm
+++ b/code/datums/components/crafting/recipes/recipes_misc.dm
@@ -404,15 +404,6 @@
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
-/datum/crafting_recipe/paperwork
- name = "Filed Paper Work"
- result = /obj/item/folder/paperwork_correct
- time = 10 //Takes time for people to file and complete paper work!
- tools = list(/obj/item/pen)
- reqs = list(/obj/item/folder/paperwork = 1)
- subcategory = CAT_MISCELLANEOUS
- category = CAT_MISC
-
/datum/crafting_recipe/coconut_bong
name = "Coconut Bong"
result = /obj/item/bong/coconut
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index 2244742f3a..ad128b01c2 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -38,7 +38,4 @@
user.show_message("You weave \the [S.name] into a workable fabric.", MSG_VISUAL)
return TRUE
-/obj/structure/loom/unanchored
- anchored = FALSE
-
#undef FABRIC_PER_SHEET
\ No newline at end of file
diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm
index 60515781f9..d59ef1093f 100644
--- a/code/modules/cargo/exports/manifest.dm
+++ b/code/modules/cargo/exports/manifest.dm
@@ -76,19 +76,3 @@
/datum/export/manifest_correct_denied/get_cost(obj/O)
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
return ..() - M.order_cost
-
-// Paper work done correctly
-
-/datum/export/paperwork_correct
- cost = 120 // finicky number 20 x 120 = 2400 per crate
- k_elasticity = 0
- unit_name = "correct paperwork"
- export_types = list(/obj/item/folder/paperwork_correct)
-
-// Paper work not done retruned
-
-/datum/export/paperwork_incorrect
- cost = -500 // Failed to meet NT standers
- k_elasticity = 0
- unit_name = "returned incorrect paperwork"
- export_types = list(/obj/item/folder/paperwork)
diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm
index 6c1742896f..1ce3a6b084 100644
--- a/code/modules/cargo/packs/materials.dm
+++ b/code/modules/cargo/packs/materials.dm
@@ -129,14 +129,6 @@
/obj/item/rcd_ammo)
crate_name = "rcd ammo"
-/datum/supply_pack/materials/loom
- name = "Loom"
- desc = "A large pre-made loom."
- cost = 1000
- contains = list(/obj/structure/loom/unanchored)
- crate_name = "loom crate"
- crate_type = /obj/structure/closet/crate/large
-
//////////////////////////////////////////////////////////////////////////////
///////////////////////////// Canisters //////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index dfaa6f0027..5265b2c2f6 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -87,37 +87,12 @@
crate_type = /obj/structure/closet/crate/wooden
crate_name = "calligraphy crate"
-/datum/supply_pack/misc/paper_work
- name = "Freelance Paper work"
- desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up.
- cost = 700 // Net of 0 credits but makes (120 x 10 = 1200)
- contains = list(/obj/item/folder/paperwork,
- /obj/item/pen/fountain
- )
- crate_name = "Paperwork"
-
-/datum/supply_pack/misc/paper_work/generate()
- . = ..()
- for(var/i in 1 to 9)
- new /obj/item/folder/paperwork(.)
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////// Entertainment ///////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-/datum/supply_pack/misc/randombedsheets
- name = "Bedsheet Crate (R)"
- desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!"
- cost = 2000
- contains = list(/obj/item/bedsheet/random)
- crate_name = "random bedsheet crate"
-
-/datum/supply_pack/misc/randombedsheets/generate()
- . = ..()
- for(var/i in 1 to 7)
- new /obj/item/bedsheet/random(.)
-
/datum/supply_pack/misc/coloredsheets
- name = "Bedsheet Crate (C)"
+ name = "Bedsheet Crate"
desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets."
cost = 1250
contains = list(/obj/item/bedsheet/blue,
From 801956a1f9932aaa1c03bd596cf9c7802fdab84e Mon Sep 17 00:00:00 2001
From: Putnam
Date: Sun, 3 May 2020 17:44:00 -0700
Subject: [PATCH 03/23] Reverts #10352.
---
code/game/objects/items/miscellaneous.dm | 8 -----
code/modules/cargo/packs/engine.dm | 10 +-----
code/modules/power/supermatter/supermatter.dm | 36 ++++---------------
3 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index c6bb350929..c4bb8c594c 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -123,11 +123,3 @@
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("skubbed")
-/obj/item/supermatterspray
- name = "supermatter spray"
- desc = "A spray bottle containing some kind of magical spray to fix the SM. \"Do not inhale.\" is written on the side. Unless aimed at the supermatter, it does nothing."
- icon = 'icons/obj/supermatter.dmi'
- icon_state = "supermatterspray"
- w_class = WEIGHT_CLASS_SMALL
- var/usesleft = 2
-
diff --git a/code/modules/cargo/packs/engine.dm b/code/modules/cargo/packs/engine.dm
index 27891f3ab6..89775c07ee 100644
--- a/code/modules/cargo/packs/engine.dm
+++ b/code/modules/cargo/packs/engine.dm
@@ -148,15 +148,7 @@
crate_name = "supermatter shard crate"
crate_type = /obj/structure/closet/crate/secure/engineering
dangerous = TRUE
-
-/datum/supply_pack/engine/supermatter_spray
- name = "Supermatter Spray Crate"
- desc = "The single thing that can truly heal the supermatter."
- cost = 2000
- contains = list(/obj/item/supermatterspray)
- crate_name = "supermatter shard crate"
- crate_type = /obj/structure/closet/crate/engineering/electrical
-
+
/datum/supply_pack/engine/tesla_coils
name = "Tesla Coil Crate"
desc = "Whether it's high-voltage executions, creating research points, or just plain old power generation: This pack of four Tesla coils can do it all!"
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 92d97365b3..650961e2f4 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -66,8 +66,6 @@
#define SUPERMATTER_COUNTDOWN_TIME 30 SECONDS
-#define SUPERMATTER_INTEGRITY_MULT 1.3 //(loss of integrity / 10) ^ 1.3
-
GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
/obj/machinery/power/supermatter_crystal
@@ -160,8 +158,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
var/datum/looping_sound/supermatter/soundloop
var/moveable = FALSE
- var/min_damage = 0
- var/power_calc = 0
/obj/machinery/power/supermatter_crystal/Initialize()
. = ..()
@@ -356,7 +352,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
//capping damage
damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage)
- damage = max(min_damage, damage) //max integrity
if(damage > damage_archived && prob(10))
playsound(get_turf(src), 'sound/effects/empulse.ogg', 50, 1)
@@ -396,7 +391,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(matter_power)
var/removed_matter = max(matter_power/MATTER_POWER_CONVERSION, 40)
- power_calc = max(power_calc + removed_matter, 0)
+ power = max(power + removed_matter, 0)
matter_power = max(matter_power - removed_matter, 0)
var/temp_factor = 50
@@ -409,7 +404,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
temp_factor = 30
icon_state = base_icon_state
- power_calc = max( (removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power_calc, 0) //Total laser power plus an overload
+ power = max( (removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power, 0) //Total laser power plus an overload
if(prob(50))
radiation_pulse(src, power * (1 + (tritiumcomp * TRITIUM_RADIOACTIVITY_MODIFIER) + ((pluoxiumcomp * PLUOXIUM_RADIOACTIVITY_MODIFIER) * pluoxiumbonus) * (power_transmission_bonus/(10-(bzcomp * BZ_RADIOACTIVITY_MODIFIER))))) // Rad Modifiers BZ(500%), Tritium(300%), and Pluoxium(-200%)
@@ -441,19 +436,15 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power))) // If they can see it without mesons on. Bad on them.
if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
var/D = sqrt(1 / max(1, get_dist(l, src)))
- l.hallucination += power_calc * config_hallucination_power * D
+ l.hallucination += power * config_hallucination_power * D
l.hallucination = clamp(0, 200, l.hallucination)
for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src),1) )
l.rad_act(rads)
- power_calc -= ((power_calc/500)**3) * powerloss_inhibitor
- if ((100-get_integrity()) < 75)
- power = (power_calc * ((100 - (0.15*(100-get_integrity()) - 5)**2) / 100)) + power_calc*0.1
- else
- power = power_calc * (((100-get_integrity())**((3*(100-get_integrity()))/1000) + 2*(100-get_integrity()))/100) //new and improved, more linear
- //power = power_calc * ((((100-get_integrity())**1.3)-(2*(100-get_integrity())))/100)
+ power -= ((power/500)**3) * powerloss_inhibitor
+
if(power > POWER_PENALTY_THRESHOLD || damage > damage_penalty_point)
if(power > POWER_PENALTY_THRESHOLD)
@@ -476,9 +467,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
supermatter_anomaly_gen(src, GRAVITATIONAL_ANOMALY, rand(5, 10))
if(power > SEVERE_POWER_PENALTY_THRESHOLD && prob(2) || prob(0.3) && power > POWER_PENALTY_THRESHOLD)
supermatter_anomaly_gen(src, PYRO_ANOMALY, rand(5, 10))
- if (damage - damage_archived > 0)
- min_damage += ((damage - damage_archived) / 9) * SUPERMATTER_INTEGRITY_MULT
- if(damage > (min_damage < 200 ? min_damage : 0) + warning_point) // while the core is still damaged and it's still worth noting its status
+ if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
if((REALTIMEOFDAY - lastwarning) / 10 >= WARNING_DELAY)
alarm()
@@ -517,7 +506,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(!istype(Proj.firer, /obj/machinery/power/emitter))
investigate_log("has been hit by [Proj] fired by [key_name(Proj.firer)]", INVESTIGATE_SUPERMATTER)
if(Proj.flag != "bullet")
- power_calc += Proj.damage * config_bullet_energy
+ power += Proj.damage * config_bullet_energy
if(!has_been_powered)
investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER)
message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
@@ -618,17 +607,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
to_chat(user, "You extract a sliver from \the [src]. \The [src] begins to react violently!")
new /obj/item/nuke_core/supermatter_sliver(drop_location())
matter_power += 200
- if (istype(W, /obj/item/supermatterspray))
- var/obj/item/supermatterspray/S = W
- if (S.usesleft > 0 && do_after(user, 60, target=src))
- min_damage = max(0,min_damage - 10)
- to_chat(user, "You spray \the [src] with [S].")
- playsound(user.loc,'sound/effects/spray2.ogg',50,1,-6)
- S.usesleft--
- if (prob(10))
- to_chat(user, "Your hands slip and you drop [S] into \the [src]!")
- Consume(S)
- return
else if(user.dropItemToGround(W))
user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
"You touch \the [src] with \the [W], and everything suddenly goes silent.\n\The [W] flashes into dust as you flinch away from \the [src].",\
From c1cd4d104fe8ac1f9a4a4b7fd8a95a1b921f55f3 Mon Sep 17 00:00:00 2001
From: Putnam
Date: Sun, 3 May 2020 20:31:11 -0700
Subject: [PATCH 04/23] Replaces the pAI candidate button with a ghost roles
button
---
code/_onclick/hud/_defines.dm | 2 +-
code/_onclick/hud/ghost.dm | 14 +++++++-------
icons/mob/screen_ghost.dmi | Bin 20940 -> 26111 bytes
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 28fd7397b0..4b963c730d 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -162,7 +162,7 @@
#define ui_ghost_orbit "SOUTH:6,CENTER-1:24"
#define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24"
#define ui_ghost_teleport "SOUTH:6,CENTER+1:24"
-#define ui_ghost_pai "SOUTH: 6, CENTER+2:24"
+#define ui_ghost_spawners "SOUTH: 6, CENTER+2:24"
//UI position overrides for 1:1 screen layout. (default is 7:5)
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index 14da637f18..0cdac111b0 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -36,13 +36,13 @@
var/mob/dead/observer/G = usr
G.dead_tele()
-/obj/screen/ghost/pai
- name = "pAI Candidate"
- icon_state = "pai"
+/obj/screen/ghost/spawners
+ name = "Ghost role spawners"
+ icon_state = "spawners"
-/obj/screen/ghost/pai/Click()
+/obj/screen/ghost/spawners/Click()
var/mob/dead/observer/G = usr
- G.register_pai()
+ G.open_spawners_menu()
/datum/hud/ghost/New(mob/owner)
..()
@@ -68,8 +68,8 @@
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/pai()
- using.screen_loc = ui_ghost_pai
+ using = new /obj/screen/ghost/spawners()
+ using.screen_loc = ui_ghost_spawners
using.hud = src
static_inventory += using
diff --git a/icons/mob/screen_ghost.dmi b/icons/mob/screen_ghost.dmi
index 6519d00aa978e24b65fe47dc5cde86aa5b0d3780..5c49bedcad7fb319796f9ddbd81b2ccaf41e1e37 100644
GIT binary patch
literal 26111
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
Y+H)?Zv07ocFS_7qs_Cd!DqDyB4^Qw$K>z>%
literal 20940
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
Date: Mon, 4 May 2020 18:20:10 +0200
Subject: [PATCH 05/23] Fixes felinid's cat ears and removes two unused
variables.
---
.../dead/new_player/sprite_accessories/_sprite_accessories.dm | 2 --
code/modules/mob/dead/new_player/sprite_accessories/ears.dm | 2 ++
.../mob/dead/new_player/sprite_accessories/legs_and_taurs.dm | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index 0b25132e00..7e366e7329 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -63,10 +63,8 @@
//Special / holdover traits for Citadel specific sprites.
var/extra = FALSE
var/extra_color_src = MUTCOLORS2 //The color source for the extra overlay.
- var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
var/extra2 = FALSE
var/extra2_color_src = MUTCOLORS3
- var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
//for snowflake/donor specific sprites
var/list/ckeys_allowed
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
index 3ba1e8b3b4..25849f24c8 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -217,6 +217,8 @@
icon_state = "cat"
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = HAIR
+ extra = TRUE
+ extra_color_src = NONE
/datum/sprite_accessory/mam_ears/catbig
name = "Cat, Big"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
index fe154ffeec..7f0f645ff1 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
@@ -21,9 +21,7 @@
/datum/sprite_accessory/taur
icon = 'modular_citadel/icons/mob/mam_taur.dmi'
- extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra = TRUE
- extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra2 = TRUE
center = TRUE
dimension_x = 64
From 066479da5f29c30884b3edfc23c6b8305dc85e11 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 5 May 2020 06:13:17 +0200
Subject: [PATCH 06/23] mandatory bump to savefile version.
---
code/modules/client/preferences_savefile.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 98b87f8d70..36cdd2463e 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 29
+#define SAVEFILE_VERSION_MAX 30
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -181,7 +181,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(lickable)
ENABLE_BITFIELD(vore_flags,LICKABLE)
- if(current_version < 29)
+ if(current_version < 30)
switch(features["taur"])
if("Husky", "Lab", "Shepherd", "Fox", "Wolf")
features["taur"] = "Canine"
From ccfce7cb6498898f404948983e5ccc75d866490b Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 5 May 2020 06:22:58 +0200
Subject: [PATCH 07/23] Makes wings/horns colors dna features instead of human
defines
---
code/__HELPERS/mobs.dm | 6 ++--
code/modules/client/preferences.dm | 25 ++++++-------
code/modules/client/preferences_savefile.dm | 36 ++++++-------------
.../mob/dead/new_player/preferences_setup.dm | 2 --
.../mob/living/carbon/human/human_defines.dm | 6 +---
.../mob/living/carbon/human/species.dm | 16 ++++-----
6 files changed, 32 insertions(+), 59 deletions(-)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index e69052ad8d..e0714a87b3 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -163,9 +163,11 @@
"tail_lizard" = pick(GLOB.tails_list_lizard),
"tail_human" = "None",
"wings" = "None",
+ "wings_color" = "FFF",
"deco_wings" = "None",
"snout" = pick(GLOB.snouts_list),
- "horns" = pick(GLOB.horns_list),
+ "horns" = "None",
+ "horns_color" = "85615a",
"ears" = "None",
"frills" = pick(GLOB.frills_list),
"spines" = pick(GLOB.spines_list),
@@ -174,7 +176,7 @@
"caps" = pick(GLOB.caps_list),
"insect_wings" = pick(GLOB.insect_wings_list),
"insect_fluff" = "None",
- "insect_markings" = pick(GLOB.insect_markings_list),
+ "insect_markings" = pick(GLOB.insect_markings_list),
"taur" = "None",
"mam_body_markings" = snowflake_markings_list.len ? pick(snowflake_markings_list) : "None",
"mam_ears" = snowflake_ears_list ? pick(snowflake_ears_list) : "None",
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index abe43e38ae..bb3a435258 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -94,8 +94,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/skin_tone = "caucasian1" //Skin color
var/use_custom_skin_tone = FALSE
var/eye_color = "000" //Eye color
- var/horn_color = "85615a" //Horn color
- var/wing_color = "fff" //Wing color
var/datum/species/pref_species = new /datum/species/human() //Mutant race
var/list/features = list("mcolor" = "FFF",
"mcolor2" = "FFF",
@@ -104,8 +102,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"tail_human" = "None",
"snout" = "Round",
"horns" = "None",
+ "horns_color" = "85615a",
"ears" = "None",
"wings" = "None",
+ "wings_color" = "FFF",
"frills" = "None",
"deco_wings" = "None",
"spines" = "None",
@@ -496,7 +496,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Horns
"
dat += "[features["horns"]]"
- dat += " Change
"
+ dat += " Change
"
mutant_category++
@@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Decorative wings
"
dat += "[features["deco_wings"]]"
- dat += " Change
"
+ dat += " Change
"
if(pref_species.mutant_bodyparts["insect_wings"])
if(!mutant_category)
@@ -618,7 +618,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Insect wings
"
dat += "[features["insect_wings"]]"
- dat += " Change
"
+ dat += " Change
"
mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += ""
@@ -1770,12 +1770,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["horns"] = new_horns
if("horns_color")
- var/new_horn_color = input(user, "Choose your character's horn colour:", "Character Preference","#"+horn_color) as color|null
+ var/new_horn_color = input(user, "Choose your character's horn colour:", "Character Preference","#"+features["horns_color"]) as color|null
if(new_horn_color)
if (new_horn_color == "#000000")
- horn_color = "#85615A"
+ features["horns_color"] = "85615A"
else
- horn_color = sanitize_hexcolor(new_horn_color)
+ features["horns_color"] = sanitize_hexcolor(new_horn_color)
if("wings")
var/new_wings
@@ -1784,12 +1784,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["wings"] = new_wings
if("wings_color")
- var/new_wing_color = input(user, "Choose your character's wing colour:", "Character Preference","#"+wing_color) as color|null
+ var/new_wing_color = input(user, "Choose your character's wing colour:", "Character Preference","#"+features["wings_color"]) as color|null
if(new_wing_color)
if (new_wing_color == "#000000")
- wing_color = "#FFFFFF"
+ features["wings_color"] = "#FFFFFF"
else
- wing_color = sanitize_hexcolor(new_wing_color)
+ features["wings_color"] = sanitize_hexcolor(new_wing_color)
if("frills")
var/new_frills
@@ -2459,9 +2459,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
organ_eyes.old_eye_color = eye_color
character.hair_color = hair_color
character.facial_hair_color = facial_hair_color
- character.horn_color = horn_color
- character.wing_color = wing_color
-
character.skin_tone = skin_tone
character.dna.skin_tone_override = use_custom_skin_tone ? skin_tone : null
character.hair_style = hair_style
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 98b87f8d70..6872def704 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 29
+#define SAVEFILE_VERSION_MAX 30
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -181,7 +181,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(lickable)
ENABLE_BITFIELD(vore_flags,LICKABLE)
- if(current_version < 29)
+ if(current_version < 30)
switch(features["taur"])
if("Husky", "Lab", "Shepherd", "Fox", "Wolf")
features["taur"] = "Canine"
@@ -190,6 +190,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if("Cow")
features["taur"] = "Cow (Spotted)"
+ if(current_version < 31)
+ S["wing_color"] >> features["wings_color"]
+ S["horn_color"] >> features["horns_color"]
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
@@ -421,15 +425,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(newtype)
pref_species = new newtype
- if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
- WRITE_FILE(S["features["mcolor"]"] , "#FFF")
-
- if(!S["features["horn_color"]"] || S["features["horn_color"]"] == "#000")
- WRITE_FILE(S["features["horn_color"]"] , "#85615a")
-
- if(!S["features["wing_color"]"] || S["features["wing_color"]"] == "#000")
- WRITE_FILE(S["features["wing_color"]"] , "#FFF")
-
//Character
S["real_name"] >> real_name
S["nameless"] >> nameless
@@ -453,8 +448,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["shirt_color"] >> shirt_color
S["socks"] >> socks
S["socks_color"] >> socks_color
- S["horn_color"] >> horn_color
- S["wing_color"] >> wing_color
S["backbag"] >> backbag
S["jumpsuit_style"] >> jumpsuit_style
S["uplink_loc"] >> uplink_spawn_loc
@@ -564,15 +557,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(!custom_names[custom_name_id])
custom_names[custom_name_id] = get_default_name(custom_name_id)
- if(!features["mcolor"] || features["mcolor"] == "#000")
- features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
-
- if(!features["horn_color"] || features["horn_color"] == "#000")
- features["horn_color"] = "85615a"
-
- if(!features["wing_color"] || features["wing_color"] == "#000")
- features["wing_color"] = "FFFFFF"
-
nameless = sanitize_integer(nameless, 0, 1, initial(nameless))
be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
@@ -599,8 +583,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
else
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones - GLOB.nonstandard_skin_tones, initial(skin_tone))
- horn_color = sanitize_hexcolor(horn_color, 3, FALSE)
- wing_color = sanitize_hexcolor(wing_color, 3, FALSE, "#FFFFFF")
+ features["horns_color"] = sanitize_hexcolor(features["horns_color"], 3, FALSE, "85615a")
+ features["wings_color"] = sanitize_hexcolor(features["wings_color"], 3, FALSE, "FFFFFF")
backbag = sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
@@ -714,8 +698,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["shirt_color"] , shirt_color)
WRITE_FILE(S["socks"] , socks)
WRITE_FILE(S["socks_color"] , socks_color)
- WRITE_FILE(S["horn_color"] , horn_color)
- WRITE_FILE(S["wing_color"] , wing_color)
+ WRITE_FILE(S["horns_color"] , features["horns_color"])
+ WRITE_FILE(S["wings_color"] , features["wings_color"])
WRITE_FILE(S["backbag"] , backbag)
WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style)
WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 317efc2c1f..9a0d9f9242 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -18,8 +18,6 @@
hair_color = random_short_color()
facial_hair_color = hair_color
eye_color = random_eye_color()
- horn_color = "85615a"
- wing_color = "fff"
if(!pref_species)
var/rando_race = pick(GLOB.roundstart_races)
pref_species = new rando_race()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 68c312b19c..59766b03a4 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -11,7 +11,7 @@
status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
-
+
//Hair colour and style
var/hair_color = "000"
var/hair_style = "Bald"
@@ -23,10 +23,6 @@
//Eye colour
var/eye_color = "000"
- var/horn_color = "85615a" //specific horn colors, because why not?
-
- var/wing_color = "fff" //wings too
-
var/skin_tone = "caucasian1" //Skin tone
var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 978976111c..aeab0042ac 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -35,10 +35,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/hair_color // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent.
-
- var/horn_color //specific horn colors, because why not?
- var/wing_color
-
var/use_skintones = NO_SKINTONES // does it use skintones or not? (spoiler alert this is only used by humans)
var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id.
var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
@@ -882,9 +878,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(EYECOLOR)
accessory_overlay.color = "#[H.eye_color]"
if(HORNCOLOR)
- accessory_overlay.color = "#[H.horn_color]"
+ accessory_overlay.color = "#[H.dna.features["horns_color"]]"
if(WINGCOLOR)
- accessory_overlay.color = "#[H.wing_color]"
+ accessory_overlay.color = "#[H.dna.features["wings_color"]]"
else
accessory_overlay.color = forced_colour
else
@@ -938,9 +934,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
extra_accessory_overlay.color = "#[H.eye_color]"
if(HORNCOLOR)
- extra_accessory_overlay.color = "#[H.horn_color]"
+ extra_accessory_overlay.color = "#[H.dna.features["horns_color"]]"
if(WINGCOLOR)
- extra_accessory_overlay.color = "#[H.wing_color]"
+ extra_accessory_overlay.color = "#[H.dna.features["wings_color"]]"
if(OFFSET_MUTPARTS in H.dna.species.offset_features)
extra_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
@@ -979,9 +975,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
else
extra2_accessory_overlay.color = "#[H.hair_color]"
if(HORNCOLOR)
- extra2_accessory_overlay.color = "#[H.horn_color]"
+ extra2_accessory_overlay.color = "#[H.dna.features["horns_color"]]"
if(WINGCOLOR)
- extra2_accessory_overlay.color = "#[H.wing_color]"
+ extra2_accessory_overlay.color = "#[H.dna.features["wings_color"]]"
if(OFFSET_MUTPARTS in H.dna.species.offset_features)
extra2_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
From 56fe430a25a28379dd267e170a302b46d50e249a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 5 May 2020 14:18:09 -0700
Subject: [PATCH 08/23] ok (#12119)
---
.../subsystem/processing/projectiles.dm | 1 -
code/modules/projectiles/projectile.dm | 18 +-----------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/code/controllers/subsystem/processing/projectiles.dm b/code/controllers/subsystem/processing/projectiles.dm
index 4171b5f8c1..8cd63c6949 100644
--- a/code/controllers/subsystem/processing/projectiles.dm
+++ b/code/controllers/subsystem/processing/projectiles.dm
@@ -3,7 +3,6 @@ PROCESSING_SUBSYSTEM_DEF(projectiles)
wait = 1
stat_tag = "PP"
flags = SS_NO_INIT|SS_TICKER
- var/global_max_tick_moves = 10
var/global_pixel_speed = 2
var/global_iterations_per_move = 16
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index f55ce75baa..432ef97dcb 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -33,7 +33,6 @@
var/fired = FALSE //Have we been fired yet
var/paused = FALSE //for suspending the projectile midair
var/last_projectile_move = 0
- var/last_process = 0
var/time_offset = 0
var/datum/point/vector/trajectory
var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location!
@@ -352,27 +351,12 @@
return TRUE //Bullets don't drift in space
/obj/item/projectile/process()
- last_process = world.time
if(!loc || !fired || !trajectory)
fired = FALSE
return PROCESS_KILL
if(paused || !isturf(loc))
- last_projectile_move += world.time - last_process //Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks.
return
- var/elapsed_time_deciseconds = (world.time - last_projectile_move) + time_offset
- time_offset = 0
- var/required_moves = speed > 0? FLOOR(elapsed_time_deciseconds / speed, 1) : MOVES_HITSCAN //Would be better if a 0 speed made hitscan but everyone hates those so I can't make it a universal system :<
- if(required_moves == MOVES_HITSCAN)
- required_moves = SSprojectiles.global_max_tick_moves
- else
- if(required_moves > SSprojectiles.global_max_tick_moves)
- var/overrun = required_moves - SSprojectiles.global_max_tick_moves
- required_moves = SSprojectiles.global_max_tick_moves
- time_offset += overrun * speed
- time_offset += MODULUS(elapsed_time_deciseconds, speed)
-
- for(var/i in 1 to required_moves)
- pixel_move(1, FALSE)
+ pixel_move(1, FALSE)
/obj/item/projectile/proc/fire(angle, atom/direct_target)
if(fired_from)
From e9ccc3ac6225a70ab21c3f9605fbdaf0116a1acc Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 01:03:54 +0200
Subject: [PATCH 09/23] Test and update.
---
code/modules/mob/living/living.dm | 4 ++--
code/modules/mob/mob_movement.dm | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5189f47fbc..4736ae5b4a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -319,8 +319,8 @@
set_pull_offsets(M, state)
/mob/living/proc/set_pull_offsets(mob/living/M, grab_state = GRAB_PASSIVE)
- if(M.buckled)
- return //don't make them change direction or offset them if they're buckled into something.
+ if(M.buckled || M.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)
+ return //don't make them change direction or offset them if they're buckled into something or in combat mode.
var/offset = 0
switch(grab_state)
if(GRAB_PASSIVE)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index adf3e349b7..872889fd53 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -100,8 +100,7 @@
if(mob.throwing)
mob.throwing.finalize(FALSE)
- var/atom/movable/P = mob.pulling
- if(P && !ismob(P) && P.density)
+ if(mob.pulling && !(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
mob.setDir(turn(mob.dir, 180))
SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVE, src, direction, n, oldloc)
From 94d67ab640b5d7a18c592f2aad71035ee0ce9169 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 01:15:30 +0200
Subject: [PATCH 10/23] Update mob_movement.dm
---
code/modules/mob/mob_movement.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 872889fd53..a607da195a 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -100,8 +100,9 @@
if(mob.throwing)
mob.throwing.finalize(FALSE)
- if(mob.pulling && !(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
- mob.setDir(turn(mob.dir, 180))
+ var/mob/living/L = mob
+ if(L.pulling && !(L.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+ L.setDir(turn(L.dir, 180))
SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVE, src, direction, n, oldloc)
From 106fb6496eb6d5b972ece921e0410af96d4e3c63 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 6 May 2020 05:30:54 -0400
Subject: [PATCH 11/23] Update hypospray.dm
---
code/modules/reagents/reagent_containers/hypospray.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 9555f5b64b..b24e6ab733 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -207,8 +207,8 @@
#define DELUXE_SELF_SPRAY 10
#define DELUXE_SELF_INJECT 10
-#define COMBAT_WAIT_SPRAY 0
-#define COMBAT_WAIT_INJECT 0
+#define COMBAT_WAIT_SPRAY 15
+#define COMBAT_WAIT_INJECT 15
#define COMBAT_SELF_SPRAY 0
#define COMBAT_SELF_INJECT 0
From ac300790266348b1e2b152d7ff04ef8555286f6f Mon Sep 17 00:00:00 2001
From: Putnam3145
Date: Wed, 6 May 2020 08:03:53 -0700
Subject: [PATCH 12/23] Make dust-on-leaving-area code less bad (#12110)
* Un-badcodes dusts_on_leaving_area.
* var/ not necessary
* Fixed the code to work
* help me
---
code/datums/elements/dusts_on_leaving_area.dm | 20 ++++++-------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/code/datums/elements/dusts_on_leaving_area.dm b/code/datums/elements/dusts_on_leaving_area.dm
index 9527e1fd3a..7b1807a15c 100644
--- a/code/datums/elements/dusts_on_leaving_area.dm
+++ b/code/datums/elements/dusts_on_leaving_area.dm
@@ -1,28 +1,20 @@
/datum/element/dusts_on_leaving_area
element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
id_arg_index = 2
- var/list/attached_mobs = list()
var/list/area_types = list()
/datum/element/dusts_on_leaving_area/Attach(datum/target,types)
. = ..()
if(!ismob(target))
return ELEMENT_INCOMPATIBLE
- attached_mobs += target
area_types = types
- START_PROCESSING(SSprocessing,src)
+ RegisterSignal(target,COMSIG_ENTER_AREA,.proc/check_dust)
/datum/element/dusts_on_leaving_area/Detach(mob/M)
. = ..()
- if(M in attached_mobs)
- attached_mobs -= M
- if(!attached_mobs.len)
- STOP_PROCESSING(SSprocessing,src)
+ UnregisterSignal(M,COMSIG_ENTER_AREA)
-/datum/element/dusts_on_leaving_area/process()
- for(var/m in attached_mobs)
- var/mob/M = m
- var/area/A = get_area(M)
- if(!(A.type in area_types))
- M.dust(force = TRUE)
- Detach(M)
+/datum/element/dusts_on_leaving_area/proc/check_dust(datum/source, area/A)
+ var/mob/M = source
+ if(istype(M) && !(A.type in area_types))
+ M.dust(force = TRUE)
From 7477878062aae209fc48f8e9a3d86f241dd4d7ff Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 17:12:15 +0200
Subject: [PATCH 13/23] Update snouts.dm
---
code/modules/mob/dead/new_player/sprite_accessories/snouts.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
index 61763e21ee..60e8ed1007 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
@@ -1,6 +1,7 @@
/datum/sprite_accessory/snouts
icon = 'icons/mob/mutant_bodyparts.dmi'
mutant_part_string = "snout"
+ relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/snouts/sharp
name = "Sharp"
@@ -154,6 +155,7 @@
icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
recommended_species = list("mammal", "slimeperson", "insect", "podweak")
mutant_part_string = "snout"
+ relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/mam_snouts/none
name = "None"
@@ -386,4 +388,4 @@
/datum/sprite_accessory/mam_snouts/froundlight
name = "Round + Light (Top)"
icon_state = "froundlight"
- color_src = MUTCOLORS
\ No newline at end of file
+ color_src = MUTCOLORS
From 9c31a89fde6a19c795fbb0a1f34787f3cf78859e Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 17:15:50 +0200
Subject: [PATCH 14/23] Update spines.dm
---
code/modules/mob/dead/new_player/sprite_accessories/spines.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/spines.dm b/code/modules/mob/dead/new_player/sprite_accessories/spines.dm
index 0885a6eb9f..54749d5ea9 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/spines.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/spines.dm
@@ -1,8 +1,10 @@
/datum/sprite_accessory/spines
icon = 'icons/mob/mutant_bodyparts.dmi'
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
/datum/sprite_accessory/spines_animated
icon = 'icons/mob/mutant_bodyparts.dmi'
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
/datum/sprite_accessory/spines/none
name = "None"
@@ -51,4 +53,4 @@
/datum/sprite_accessory/spines_animated/aqautic
name = "Aquatic"
- icon_state = "aqua"
\ No newline at end of file
+ icon_state = "aqua"
From d13ed03861362e71b08c2f497738fabe6bf717c4 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 17:18:03 +0200
Subject: [PATCH 15/23] Update tails.dm
---
code/modules/mob/dead/new_player/sprite_accessories/tails.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index ba265e82ac..2bb0d6ba77 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -523,6 +523,7 @@
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
mutant_part_string = "tailwag"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/mam_tails_animated/none
name = "None"
From 13eeffbf273acd835ae637c0b5262acb31e38937 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 6 May 2020 17:19:52 +0200
Subject: [PATCH 16/23] Update wings.dm
---
code/modules/mob/dead/new_player/sprite_accessories/wings.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 2b25fe8848..34767a10f1 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -7,6 +7,7 @@
/datum/sprite_accessory/wings_open
icon = 'icons/mob/wings.dmi'
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/wings_open/angel
name = "Angel"
@@ -49,6 +50,7 @@
dimension_x = 46
center = TRUE
dimension_y = 34
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/deco_wings/bat
name = "Bat"
From 5c5fc3795912f59b46bfa8b9f4cb19003c935d43 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 6 May 2020 08:50:50 -0700
Subject: [PATCH 17/23] Introducing noitatsxoB (#12073)
* okay
* ok
* ok
* ok
* ok
* why am i doing this
* WHY DID I DO THIS
* mirror doesn't work
* compile
* shuttles should work
* fix engine
* fix engine
* off by 1
* ok
* adds proccall to write next map
* haha post processing funny
* fixes
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* Update code/modules/mapping/map_template.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
code/__DEFINES/mapping/maploader.dm | 3 +
code/controllers/subsystem/mapping.dm | 6 +-
code/datums/shuttles.dm | 9 +-
code/game/objects/effects/landmarks.dm | 3 +-
.../admin/verbs/map_template_loadverb.dm | 5 +-
code/modules/mapping/dmm_suite.dm | 63 -----
.../{datums => modules/mapping}/map_config.dm | 31 ++-
.../mapping/map_orientation_pattern.dm | 46 ++++
code/modules/mapping/map_template.dm | 151 +++++++++---
code/modules/mapping/preloader.dm | 27 ++-
code/modules/mapping/reader.dm | 221 +++++++++++-------
code/modules/power/apc.dm | 4 +
code/modules/power/cable.dm | 15 ++
code/modules/shuttle/manipulator.dm | 2 +-
tgstation.dme | 5 +-
15 files changed, 398 insertions(+), 193 deletions(-)
create mode 100644 code/__DEFINES/mapping/maploader.dm
delete mode 100644 code/modules/mapping/dmm_suite.dm
rename code/{datums => modules/mapping}/map_config.dm (83%)
create mode 100644 code/modules/mapping/map_orientation_pattern.dm
diff --git a/code/__DEFINES/mapping/maploader.dm b/code/__DEFINES/mapping/maploader.dm
new file mode 100644
index 0000000000..e225e68867
--- /dev/null
+++ b/code/__DEFINES/mapping/maploader.dm
@@ -0,0 +1,3 @@
+//map template annihilate_bounds
+#define MAP_TEMPLATE_ANNIHILATE_PRELOAD 1 //annihilate bounds before starting loading
+#define MAP_TEMPLATE_ANNIHILATE_LOADING 2 //"sweeping" delete during loading
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 526e4b98e3..f1f7cf356a 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -196,7 +196,7 @@ SUBSYSTEM_DEF(mapping)
z_list = SSmapping.z_list
-/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE)
+/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, orientation = SOUTH)
. = list()
var/start_time = REALTIMEOFDAY
@@ -236,7 +236,7 @@ SUBSYSTEM_DEF(mapping)
// load the maps
for (var/P in parsed_maps)
var/datum/parsed_map/pm = P
- if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE))
+ if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE, orientation = orientation))
errorList |= pm.original_path
if(!silent)
INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
@@ -252,7 +252,7 @@ SUBSYSTEM_DEF(mapping)
// load the station
station_start = world.maxz + 1
INIT_ANNOUNCE("Loading [config.map_name]...")
- LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION)
+ LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, FALSE, config.orientation)
if(SSdbcore.Connect())
var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 0a44954e51..6e4b1a6305 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -23,14 +23,14 @@
mappath = "[prefix][shuttle_id].dmm"
. = ..()
-/datum/map_template/shuttle/preload_size(path, cache)
+/datum/map_template/shuttle/preload_size(path = mappath, force_cache = FALSE)
. = ..(path, TRUE) // Done this way because we still want to know if someone actualy wanted to cache the map
if(!cached_map)
return
discover_port_offset()
- if(!cache)
+ if(!cached_map)
cached_map = null
/datum/map_template/shuttle/proc/discover_port_offset()
@@ -53,12 +53,11 @@
++xcrd
--ycrd
-/datum/map_template/shuttle/load(turf/T, centered, register=TRUE)
+/datum/map_template/shuttle/load(turf/T, centered = FALSE, orientation = SOUTH, annihilate = default_annihilate, force_cache = FALSE, rotate_placement_to_orientation = FALSE, register = TRUE)
. = ..()
if(!.)
return
- var/list/turfs = block( locate(.[MAP_MINX], .[MAP_MINY], .[MAP_MINZ]),
- locate(.[MAP_MAXX], .[MAP_MAXY], .[MAP_MAXZ]))
+ var/list/turfs = get_last_loaded_turf_block()
for(var/i in 1 to turfs.len)
var/turf/place = turfs[i]
if(istype(place, /turf/open/space)) // This assumes all shuttles are loaded in a single spot then moved to their real destination.
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 851a041aab..9934f1a658 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -492,7 +492,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
if(!template)
return FALSE
testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])")
- template.load(T, centered = FALSE)
+ template.load(T, centered = FALSE, orientation = dir, rotate_placement_to_orientation = TRUE)
template.loaded++
GLOB.stationroom_landmarks -= src
qdel(src)
@@ -504,7 +504,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3)
icon = 'icons/rooms/box/engine.dmi'
-
/obj/effect/landmark/stationroom/box/engine/New()
. = ..()
templates = CONFIG_GET(keyed_list/box_random_engine)
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index d71cdca991..e89c3ad5a6 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -18,9 +18,12 @@
var/image/item = image('icons/turf/overlays.dmi',S,"greenOverlay")
item.plane = ABOVE_LIGHTING_PLANE
preview += item
+ var/list/orientations = list("South" = SOUTH, "North" = NORTH, "East" = EAST, "West" = WEST)
+ var/choice = input(src, "Which orientation? Maps are normally facing SOUTH.", "Template Orientation", "South") as null|anything in orientations
+ var/orientation = orientations[choice]
images += preview
if(alert(src,"Confirm location.","Template Confirm","Yes","No") == "Yes")
- if(template.load(T, centered = TRUE))
+ if(template.load(T, centered = TRUE, orientation = orientation))
message_admins("