Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions code/game/jobs/access_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,3 +581,47 @@ var/const/access_crate_cash = 200
/datum/access/crate_cash
id = access_crate_cash
access_type = ACCESS_TYPE_NONE

/*******
* Rental *
*******/

var/const/access_small_rental = 301
/datum/access/small_rental
id = access_small_rental
access_type = ACCESS_TYPE_NONE

var/const/access_small_rental2 = 302
/datum/access/small_rental2
id = access_small_rental2
access_type = ACCESS_TYPE_NONE

var/const/access_small_rental3= 303
/datum/access/small_rental3
id = access_small_rental3
access_type = ACCESS_TYPE_NONE

var/const/access_small_rental4 = 304
/datum/access/small_rental4
id = access_small_rental4
access_type = ACCESS_TYPE_NONE

var/const/access_medium_rental = 305
/datum/access/medium_rental
id = access_medium_rental
access_type = ACCESS_TYPE_NONE

var/const/access_medium_rental2 = 306
/datum/access/medium_rental2
id = access_medium_rental2
access_type = ACCESS_TYPE_NONE

var/const/access_medium_rental3 = 307
/datum/access/medium_rental3
id = access_medium_rental3
access_type = ACCESS_TYPE_NONE

var/const/access_large_rental = 308
/datum/access/large_rental
id = access_large_rental
access_type = ACCESS_TYPE_NONE
92 changes: 92 additions & 0 deletions code/game/objects/items/weapons/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -413,3 +413,95 @@ var/const/NO_EMAG_ACT = -50
fingerprint_hash = md5("A"+registered_name)
blood_type = pick(GLOB.blood_types)
update_name()

/*******
* Rental *
*******/

/obj/item/card/id/smallrental
name = "Rental ID S1"
desc = "Keycard for S-Unit 1."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/smallrental

/obj/item/card/id/smallrental/New()
access = access_small_rental
..()

/obj/item/card/id/smallrental2
name = "Rental ID S2"
desc = "Keycard for S-Unit 2."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/smallrental2

/obj/item/card/id/smallrental2/New()
access = access_small_rental2
..()

/obj/item/card/id/smallrental3
name = "Rental ID S3"
desc = "Keycard for S-Unit 3."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/smallrental3

/obj/item/card/id/smallrental3/New()
access = access_small_rental3
..()

/obj/item/card/id/smallrental4
name = "Rental ID S4"
desc = "Keycard for S-Unit 4."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/smallrental4

/obj/item/card/id/smallrental4/New()
access = access_small_rental4
..()

/obj/item/card/id/mediumrental
name = "Rental ID M1"
desc = "Keycard for M-Unit 1."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/mediumrental

/obj/item/card/id/mediumrental/New()
access = access_medium_rental
..()

/obj/item/card/id/mediumrental2
name = "Rental ID M2"
desc = "Keycard for M-Unit 2."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/mediumrental2

/obj/item/card/id/mediumrental2/New()
access = access_medium_rental2
..()

/obj/item/card/id/mediumrental3
name = "Rental ID M3"
desc = "Keycard for M-Unit 3."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/mediumrental3

/obj/item/card/id/mediumrental3/New()
access = access_medium_rental3
..()

/obj/item/card/id/largerental
name = "Rental ID L1"
desc = "Keycard for L-Unit 1."
icon_state = "guest"
spawn_tags = null
bad_type = /obj/item/card/id/largerental

/obj/item/card/id/largerental/New()
access = access_large_rental
..()
15 changes: 15 additions & 0 deletions code/game/objects/items/weapons/storage/briefcase.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,18 @@
max_storage_space = 16
matter = list(MATERIAL_BIOMATTER = 8, MATERIAL_PLASTIC = 4)
price_tag = 90

/obj/item/storage/briefcase/club

/obj/item/storage/briefcase/club/populate_contents()
var/list/things2spawn = list(
/obj/item/card/id/smallrental,
/obj/item/card/id/smallrental2,
/obj/item/card/id/smallrental3,
/obj/item/card/id/smallrental4,
/obj/item/card/id/mediumrental,
/obj/item/card/id/mediumrental2,
/obj/item/card/id/mediumrental3,
/obj/item/card/id/largerental)
for(var/path in things2spawn)
new path(src)
10 changes: 9 additions & 1 deletion code/game/objects/landmarks/join.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ GLOBAL_LIST_EMPTY(spawntypes)
spawn_datum_type = /datum/spawnpoint/cryo/starboard
disallow_job = list("Robot")

/obj/landmark/join/late/cryo/foward
name = "Foward Cryogenic Storage"
icon_state = "player-blue-cluster"
join_tag = "foward_late_cryo"
message = "has completed cryogenic revival"
spawn_datum_type = /datum/spawnpoint/cryo/foward
disallow_job = list("Robot")

/obj/landmark/join/late/dormitory
name = "Dormitory"
icon_state = "player-blue-cluster"
Expand Down Expand Up @@ -75,4 +83,4 @@ GLOBAL_LIST_EMPTY(spawntypes)
anchored = TRUE
alpha = 124
invisibility = 101
join_tag = null
join_tag = null
2 changes: 2 additions & 0 deletions code/modules/client/preferences_spawnpoints.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@
//Starboard Cryogenics
/datum/spawnpoint/cryo/starboard

//Foward Cryogenics
/datum/spawnpoint/cryo/foward

/**********************
DORMITORY SPAWNING
Expand Down
Binary file modified icons/obj/bedsheets.dmi
Binary file not shown.
Binary file modified icons/obj/furniture.dmi
Binary file not shown.
Loading
Loading