Skip to content

Commit

Permalink
Merge pull request #5 from silencer-pl/dev
Browse files Browse the repository at this point in the history
Patch 0 - Hotfixes

001 is playable as of an on-server test. This marks a freeze on anything other than adding food etc items and atmospherics to the map.
  • Loading branch information
silencer-pl authored Mar 28, 2024
2 parents fefaf9e + 5de0fd6 commit a0ad02b
Show file tree
Hide file tree
Showing 24 changed files with 518 additions and 368 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/chargen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#define CHARGEN_DUTY_FORCEDREC "Involuntary Recruitment"
#define CHARGEN_DUTY_HATRED "Hatred"
#define CHARGEN_DUTY_BALANCING "Balancing Influence"
#define CHARGEN_DUTY_PERSON "Friend of Loved One"
#define CHARGEN_DUTY_PERSON "Friend or Loved One"
#define CHARGEN_DUTY_TRANSFER "Transfer"

#define CHARGEN_DUTY list(CHARGEN_DUTY_HONOR, CHARGEN_DUTY_STEPSTONE, CHARGEN_DUTY_IDEALIST, CHARGEN_DUTY_FORCEDREC, CHARGEN_DUTY_HATRED, CHARGEN_DUTY_BALANCING, CHARGEN_DUTY_PERSON, CHARGEN_DUTY_TRANSFER)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/chargen/foundation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/datum/chargen/foundation/leader
name = CHARGEN_FOUNDATION_LEADER
desc = "You were the <b>leader of your friends' group<, the class or student council president, the local sports team leader</b>, or possibly all three at once and many more. Whatever group you were part of <b>you naturally gravitated to leadership positions thanks to a mixture of charisma and talent.</b> You may have not always been the most talented person in the room, but whether it was though having <b>the natural perseverance and talent to be considered a good leader, or the ambition and lack of morals to fake your way there</b>, you were always at the head. Regardless of your personal talent or morals, once you get there, you are <b>a genuinely good leader</b>, although that too can be understood <b>both as someone who takes care of their team or someone who always gets the job done. </b></p><p>There is likely a record of your achievements and the UACM has taken notice of your tendencies. You are <b>likely to be picked as a leader or coordinator of special tasks</b>, should they require one and conversely <b>not be the first pick in matters where you aren't eligible or there aren't any clear leadership posts</b>."
desc = "You were the <b>leader of your friends' group, the class or student council president, the local sports team leader</b>, or possibly all three at once and many more. Whatever group you were part of <b>you naturally gravitated to leadership positions thanks to a mixture of charisma and talent.</b> You may have not always been the most talented person in the room, but whether it was though having <b>the natural perseverance and talent to be considered a good leader, or the ambition and lack of morals to fake your way there</b>, you were always at the head. Regardless of your personal talent or morals, once you get there, you are <b>a genuinely good leader</b>, although that too can be understood <b>both as someone who takes care of their team or someone who always gets the job done. </b></p><p>There is likely a record of your achievements and the UACM has taken notice of your tendencies. You are <b>likely to be picked as a leader or coordinator of special tasks</b>, should they require one and conversely <b>not be the first pick in matters where you aren't eligible or there aren't any clear leadership posts</b>."

/datum/chargen/foundation/overachiever
name = CHARGEN_FOUNDATION_OVERACHIEVER
Expand Down
2 changes: 1 addition & 1 deletion code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
var/voteweight = 1

// Config actually from the JSON - default values
var/map_name = "LV624"
var/map_name = "The Outer Veil PST"
var/map_path = "map_files/LV624"
var/map_file = "LV624.dmm"

Expand Down
1 change: 1 addition & 0 deletions code/game/area/ovpst.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/area/ovpst
name = "The Outer Veil Primary Supply Terminal - Interiors"
icon = 'icons/turf/area_almayer.dmi'
// ambience = list('sound/ambience/shipambience.ogg')
icon_state = "almayer"
Expand Down
2 changes: 1 addition & 1 deletion code/game/area/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Loading the same shuttle map at a different time will produce distinct area instances.
unique = FALSE

base_lighting_alpha = 255
// base_lighting_alpha = 255


///area/shuttle/Initialize()
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/sectorpatrol/cargo_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@

/obj/structure/cargo/crate/
name = "generic cargo crate"
density = TRUE
opacity = FALSE
var/cargo_manifest

/obj/structure/cargo/crate/examine(mob/user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
return
if (puzzlebox_admin_option == "Begin final stage")
puzzlebox_global_status = 9
to_chat(world, narrate_head("The loudspeaker system on the dorm level and inside the crypt comes alive and announces with a male, robotic voice:"))
to_chat(world, narrate_body("Security Scan Cleared. Unsealing Crypt."))
for (var/obj/structure/eventterminal/puzzle04/final_log/T in world)
INVOKE_ASYNC(T, TYPE_PROC_REF(/obj/structure/eventterminal/puzzle04/final_log, play_final_log))
return
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
desc_lore = "Tables are, well, tables. Any time a human and sometimes non-human needs a place to put things, point at things, nap, sleep, drink, eat on, eat off, hit in anger, throw at enemies, play cards on and many, many, MANY other uses, tables are the devices of choice. Out in space, tables are used as often and in as many applications as they are back on Earth and will likely continue doing so in the foreseeable future. "
var/variant_id = "default"
anchored = 1
opacity = FALSE
density = TRUE

/obj/structure/surface/modular/table/attackby(obj/item/C, mob/user)

Expand Down Expand Up @@ -38,6 +40,8 @@
var/crafting_bed_bedsheet_id = "default"
var/variant_id = "default"
anchored = 1
opacity = FALSE
density = TRUE

/obj/structure/bed/modular/attackby(obj/item/C, mob/user)

Expand Down Expand Up @@ -156,6 +160,8 @@
storage_capacity = 15
store_mobs = FALSE
anchored = 1
opacity = FALSE
density = TRUE
var/variant_id = "default"
var/crafting_drawer_color = "default"

Expand Down Expand Up @@ -198,6 +204,8 @@
var/crafting_chair_wheel_id
propelled = FALSE
can_rotate = TRUE
opacity = FALSE
density = FALSE



Expand Down
Loading

0 comments on commit a0ad02b

Please sign in to comment.