Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add:New map abandoned storage #5646

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3b3191e
Add files via upload
Aug 17, 2024
2f339cf
Add files via upload
Aug 17, 2024
17b6655
Add files via upload
Aug 17, 2024
c5eb2f8
Add files via upload
Aug 17, 2024
ab4caef
Add files via upload
Aug 17, 2024
d7b375e
Add files via upload
Aug 17, 2024
ecf2834
Add files via upload
Aug 17, 2024
258084f
Add files via upload
Aug 17, 2024
d2907dc
Add files via upload
Aug 17, 2024
b8ed565
Update paradise.dme
Aug 17, 2024
1965bc2
Add files via upload
Aug 17, 2024
8536175
Add files via upload
Aug 17, 2024
f92d5b2
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Aug 17, 2024
d66ff15
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Aug 24, 2024
7ed3845
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Aug 31, 2024
dc92c2e
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Aug 31, 2024
13ec866
Dolgozdanii fix?
Sep 5, 2024
a6912c3
Add files via upload
Sep 5, 2024
729818c
pizdec
Sep 5, 2024
fec17ff
Посадили как то маппера кодить, а мерж конфликт из-за пустой строки е…
Kray1k Sep 5, 2024
7bd3c05
Вроде это ему надо
Kray1k Sep 5, 2024
1fefbed
Не, вроде это.
Kray1k Sep 5, 2024
49b996d
Da
Sep 5, 2024
ac05608
Блядская строка
Sep 5, 2024
c388bab
Великий рефактор
Kray1k Sep 5, 2024
4110f67
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 6, 2024
d88159c
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 6, 2024
84c5c14
Brigadier's tweaks.
Daeberdir Sep 9, 2024
b72b0db
Merge remote-tracking branch 'upstream/master220' into pr/5646
Daeberdir Sep 9, 2024
7a78c28
Delo sdelano
Sep 11, 2024
ab655c9
СДММ Съел поменял кодировку файла, база? база.
Sep 11, 2024
e75f3fb
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 11, 2024
2ec2c76
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 18, 2024
a2c5701
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 27, 2024
1ad993c
Merge branch 'ss220-space:master220' into new_map_abandoned_storage
Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,600 changes: 6,600 additions & 0 deletions _maps/map_files/RandomRuins/SpaceRuins/abandoned_storage.dmm

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions code/__DEFINES/secret_documents.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//Determines who the documents will be sold to
#define INTEREST_NANOTRASEN (1<<0) // NT cargo interested in this.
#define INTEREST_SYNDICATE (1<<1) // Syndicate cargo interested in this.
8 changes: 8 additions & 0 deletions code/datums/ruins/space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,11 @@
However, it seems that hardly anyone is left on it now.. Or not?"
allow_duplicates = FALSE
cost = 2

/datum/map_template/ruin/space/abandoned_storage
id = "abandoned_storage"
suffix = "abandoned_storage.dmm"
name = "Abandoned Storage"
description = "Just an old and abandoned place, previously used for storing various supplies."
allow_duplicates = FALSE
cost = 2
20 changes: 19 additions & 1 deletion code/game/area/ss13_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,7 @@ This applies to all STANDARD station areas

/area/security/visiting_room
name = "Visiting Room"
icon_state = "red"
icon_state = "visiting-room"

/area/security/prisonlockers
name = "Prisoner Lockers"
Expand Down Expand Up @@ -3184,3 +3184,21 @@ GLOBAL_LIST_INIT(centcom_areas, list(
/area/ruin/space/pirate_base/black_market
name = "Black Market"
icon_state = "awaycontent23"

//Abandoned Storage
/area/ruin/space/abandoned_storage
name = "Abandoned Storage"
icon_state = "abandoned_storage"
requires_power = TRUE
power_equip = FALSE
power_light = FALSE
power_environ = FALSE

/area/ruin/space/abandoned_storage/abandoned_storage_shuttle
name = "Abandoned Shuttle"
icon_state = "abandoned_storage_shuttle"
has_gravity = FALSE

/area/ruin/space/abandoned_storage_asteroid
name = "Abandoned Storage Asteroid"
icon_state = "abandoned_storage_asteroid"
16 changes: 7 additions & 9 deletions code/game/machinery/computer/syndie_cargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ GLOBAL_LIST_INIT(data_storages, list()) //list of all cargo console data storage
/obj/machinery/computer/syndie_supplycomp/proc/sell() //Этот код ищет зоны где находятся телепады отправки и продаёт ящики и товар в них

var/plasma_count = 0
var/intel_count = 0
var/crate_count = 0

var/msg = "<center>---[station_time_timestamp()]---</center><br>"
Expand Down Expand Up @@ -418,9 +417,13 @@ GLOBAL_LIST_INIT(data_storages, list()) //list of all cargo console data storage
var/obj/item/stack/sheet/mineral/plasma/P = thing
plasma_count += P.amount

// Sell nanotrasen intel
if(istype(thing, /obj/item/documents/nanotrasen))
++intel_count
// Sell intel
if(istype(thing, /obj/item/documents))
var/obj/item/documents/docs = thing
if(INTEREST_SYNDICATE & docs.sell_interest)
cashEarned = round(data_storage.cash_per_intel * docs.sell_multiplier)
data_storage.cash += cashEarned
msg += "[span_good("+[cashEarned]")]: Received enemy intelligence.<br>"

// Sell tech levels
if(istype(thing, /obj/item/disk/tech_disk))
Expand Down Expand Up @@ -481,11 +484,6 @@ GLOBAL_LIST_INIT(data_storages, list()) //list of all cargo console data storage
msg += "[span_good("+[cashEarned]")]: Received [plasma_count] unit(s) of exotic material.<br>"
data_storage.cash += cashEarned

if(intel_count > 0)
cashEarned = round(intel_count * data_storage.cash_per_intel)
msg += "[span_good("+[cashEarned]")]: Received [intel_count] article(s) of enemy intelligence.<br>"
data_storage.cash += cashEarned

if(crate_count > 0)
cashEarned = round(crate_count * data_storage.cash_per_crate)
msg += "[span_good("+[cashEarned]")]: Received [crate_count] crate(s).<br>"
Expand Down
12 changes: 12 additions & 0 deletions code/game/objects/items/documents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@
layer = 4
pressure_resistance = 2
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/sell_multiplier = 0
var/sell_interest = NONE

/obj/item/documents/nanotrasen
desc = "\"Top Secret\" Nanotrasen documents printed on special copy-protected paper. It is filled with complex diagrams and lists of names, dates and coordinates."
icon_state = "docs_verified"
sell_multiplier = 1
sell_interest = INTEREST_SYNDICATE

/obj/item/documents/syndicate
desc = "\"Top Secret\" documents printed on special copy-protected paper. It details sensitive Syndicate operational intelligence."
sell_multiplier = 1
sell_interest = INTEREST_NANOTRASEN

/obj/item/documents/syndicate/red
name = "'Red' secret documents"
Expand Down Expand Up @@ -53,3 +59,9 @@
poison_total -= poison_dose
add_attack_logs(src, user, "Picked up [src], the trapped syndicate documents")
return ..()

/obj/item/documents/ussp
desc = "\"Top Secret\" USSP documents printed on special copy-protected paper. These time-yellowed folders contain shocking secrets of the USSP. Among them are reports of experiments on humans, plans to capture other stations and schemes of top-secret weapons. Some of the pages are covered with dried blood, and crazy scribbles are visible in the margins. Who knows what terrible secrets these documents still hide? But be careful - knowing these secrets can cost you your life!"
icon_state = "docs_red"
sell_multiplier = 0.8
sell_interest = ALL
6 changes: 6 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
buildstacktype = /obj/item/stack/sheet/mineral/sandstone
buildstackamount = 15

/obj/structure/bed/old
name = "old bed"
desc = "This is a very old spring bed, it looks extremely UNCOMFORTABLE, you would not lie on it for anything in your life."
icon_state = "catwalkcouch1"
comfort = 0

/obj/structure/bed/proc/handle_rotation()
return

Expand Down
5 changes: 4 additions & 1 deletion code/modules/paperwork/folders.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,7 @@
new /obj/item/documents/syndicate/mining(src)
update_icon(UPDATE_OVERLAYS)


/obj/item/folder/ussp
name = "folder"
desc = "A folder with a hammer and sickle seal."
icon_state = "folder_ussp"
37 changes: 17 additions & 20 deletions code/modules/shuttle/supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
if(z != level_name_to_num(CENTCOMM)) //we only sell when we are -at- centcomm
return TRUE

var/intel_count = 0
var/crate_count = 0
var/quest_reward

Expand Down Expand Up @@ -168,7 +167,7 @@
if(slip.erroneous && denied) // Caught a mistake by Centcom (IDEA: maybe Centcom rarely gets offended by this)
pointsEarned = slip.points - SSshuttle.points_per_crate
SSshuttle.points += pointsEarned // For now, give a full refund for paying attention (minus the crate cost)
msg += "<span class='good'>+[pointsEarned]</span>: Station correctly denied package [slip.ordernumber]: "
msg += "[span_good("+[pointsEarned]")]: Station correctly denied package [slip.ordernumber]: "
if(slip.erroneous & MANIFEST_ERROR_NAME)
msg += "Destination station incorrect. "
else if(slip.erroneous & MANIFEST_ERROR_COUNT)
Expand All @@ -178,10 +177,10 @@
msg += "Points refunded.<br>"
else if(!slip.erroneous && !denied) // Approving a proper order awards the relatively tiny points_per_slip
SSshuttle.points += SSshuttle.points_per_slip
msg += "<span class='good'>+[SSshuttle.points_per_slip]</span>: Package [slip.ordernumber] accorded.<br>"
msg += "[span_good("+[SSshuttle.points_per_slip]")]: Package [slip.ordernumber] accorded.<br>"
else // You done goofed.
if(slip.erroneous)
msg += "<span class='good'>+0</span>: Station approved package [slip.ordernumber] despite error: "
msg += "[span_good("+0")]: Station approved package [slip.ordernumber] despite error: "
if(slip.erroneous & MANIFEST_ERROR_NAME)
msg += "Destination station incorrect."
else if(slip.erroneous & MANIFEST_ERROR_COUNT)
Expand All @@ -192,13 +191,17 @@
else
pointsEarned = round(SSshuttle.points_per_crate - slip.points)
SSshuttle.points += pointsEarned
msg += "<span class='bad'>[pointsEarned]</span>: Station denied package [slip.ordernumber]. Our records show no fault on our part.<br>"
msg += "[span_bad("[pointsEarned]")]: Station denied package [slip.ordernumber]. Our records show no fault on our part.<br>"
find_slip = FALSE
continue

// Sell syndicate intel
if(istype(thing, /obj/item/documents/syndicate))
++intel_count
// Sell intel
if(istype(thing, /obj/item/documents))
var/obj/item/documents/docs = thing
if(INTEREST_NANOTRASEN & docs.sell_interest)
pointsEarned = round(SSshuttle.points_per_intel * docs.sell_multiplier)
SSshuttle.points += pointsEarned
msg += "[span_good("+[pointsEarned]")]: Received important intelligence.<br>"

// Send tech levels
if(istype(thing, /obj/item/disk/tech_disk))
Expand Down Expand Up @@ -232,26 +235,20 @@
A.money += crate.quest.maximum_cash - round(crate.quest.maximum_cash * crate.penalty / 4)
SSshuttle.cargo_money_account.money += crate.quest.maximum_cash - round(crate.quest.maximum_cash * crate.penalty / 4)
crate.console.on_quest_complete()
msg += "<span class='good'>+[pointsEarned]</span>: Received requested mecha: [crate.quest.name].<br>"
msg += "[span_good("+[pointsEarned]")]: Received requested mecha: [crate.quest.name].<br>"
crate.quest.id.robo_bounty = null
crate.quest = null

qdel(MA, force = TRUE)
SSshuttle.sold_atoms += "."


if(intel_count > 0)
pointsEarned = round(intel_count * SSshuttle.points_per_intel)
msg += "<span class='good'>+[pointsEarned]</span>: Received [intel_count] article(s) of enemy intelligence.<br>"
SSshuttle.points += pointsEarned

if(quest_reward > 0)
msg += "<span class='good'>+[quest_reward]</span>: Received reward points for quests.<br>"
msg += "[span_good("+[quest_reward]")]: Received reward points for quests.<br>"
SSshuttle.points += quest_reward

if(crate_count > 0)
pointsEarned = round(crate_count * SSshuttle.points_per_crate)
msg += "<span class='good'>+[pointsEarned]</span>: Received [crate_count] crate(s).<br>"
msg += "[span_good("+[pointsEarned]")]: Received [crate_count] crate(s).<br>"
SSshuttle.points += pointsEarned

SSshuttle.centcom_message += "[msg]<hr>"
Expand Down Expand Up @@ -401,7 +398,7 @@

/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
playsound(src, pick('sound/machines/button.ogg', 'sound/machines/button_alternate.ogg', 'sound/machines/button_meloboom.ogg'), 20)
return 1

Expand All @@ -416,7 +413,7 @@
if(!hacked)
add_attack_logs(user, src, "emagged")
if(user)
to_chat(user, "<span class='notice'>Special supplies unlocked.</span>")
to_chat(user, span_notice("Special supplies unlocked."))
hacked = TRUE
return

Expand Down Expand Up @@ -513,7 +510,7 @@
if(is_public)
return
if(SSshuttle.supply.canMove())
to_chat(usr, "<span class='warning'>For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.</span>")
to_chat(usr, span_warning("For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons."))
else if(SSshuttle.supply.getDockedId() == "supply_home")
SSshuttle.toggleShuttle("supply", "supply_home", "supply_away", 1)
investigate_log("[key_name_log(usr)] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents: [SSshuttle.sold_atoms]", INVESTIGATE_CARGO)
Expand Down
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file modified icons/obj/objects.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\rolebans.dm"
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\secret_documents.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
#include "code\__DEFINES\sensor_devices.dm"
#include "code\__DEFINES\shuttle.dm"
Expand Down