cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Private yacht (#18211)

Browse Source 
* hmmm

* 8

* 56789

* 9

* a

* :)

* k

* o

* a

* 768

* h

* 5

* j

* h

* 4

* 12

* 9r

* gg

* qqqqqq

* hmm

* 8

* r

* ddddd

* 6

* tryjsrtjs45rujhrtfd

* trfjtrdxjs456 uya45 rst hrstyj

* o

* idk

* l

* a

* e

* 315

* cc

* q

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2024-02-05 20:23:16 +00:00
committed by GitHub
co-authored by DreamySkrell <>
parent b0033b4c91
commit 4fbd03bcd6
13 changed files with 71189 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/lighting/hull_beacon.dm
+8 -1
View File
@@ -10,6 +10,13 @@
/obj/item/hullbeacon/red
name = "red hull beacon"
desc = "A light-emitting red hull beacon."
icon_state = "beacon_red_on"
icon_state = "beacon_green_on"
light_color = LIGHT_COLOR_RED
light_range = 3
/obj/item/hullbeacon/green
name = "green hull beacon"
desc = "A light-emitting green hull beacon."
icon_state = "beacon_red_on"
light_color = LIGHT_COLOR_GREEN
light_range = 3
code/game/objects/items/weapons/storage/wallets.dm
+65 -38
View File
@@ -125,44 +125,6 @@
if(istype(id) && is_adjacent)
id.show(user)
/obj/item/storage/wallet/random/fill()
..()
var/item1_type = pick( \
/obj/item/spacecash/c10, \
/obj/item/spacecash/c100, \
/obj/item/spacecash/c1000, \
/obj/item/spacecash/c20, \
/obj/item/spacecash/c200, \
/obj/item/spacecash/c50, \
/obj/item/spacecash/c500 \
)
var/item2_type
if(prob(50))
item2_type = pick( \
/obj/item/spacecash/c10, \
/obj/item/spacecash/c100, \
/obj/item/spacecash/c1000, \
/obj/item/spacecash/c20, \
/obj/item/spacecash/c200, \
/obj/item/spacecash/c50, \
/obj/item/spacecash/c500 \
)
var/item3_type = pick( \
/obj/item/coin/silver, \
/obj/item/coin/silver, \
/obj/item/coin/gold, \
/obj/item/coin/iron, \
/obj/item/coin/iron, \
/obj/item/coin/iron \
)
if(item1_type)
new item1_type(src)
if(item2_type)
new item2_type(src)
if(item3_type)
new item3_type(src)
/obj/item/storage/wallet/proc/mob_icon_update()
if (ismob(src.loc))
var/mob/M = src.loc
@@ -252,3 +214,68 @@
plastic_film = image('icons/mob/lanyard_overlays.dmi', icon_state = "[plastic_film_overlay_state]")
I.add_overlay(plastic_film)
return I
// wallet subtypes
/obj/item/storage/wallet/random/fill()
..()
var/item1_type = pick( \
/obj/item/spacecash/c10, \
/obj/item/spacecash/c100, \
/obj/item/spacecash/c1000, \
/obj/item/spacecash/c20, \
/obj/item/spacecash/c200, \
/obj/item/spacecash/c50, \
/obj/item/spacecash/c500 \
)
var/item2_type
if(prob(50))
item2_type = pick( \
/obj/item/spacecash/c10, \
/obj/item/spacecash/c100, \
/obj/item/spacecash/c1000, \
/obj/item/spacecash/c20, \
/obj/item/spacecash/c200, \
/obj/item/spacecash/c50, \
/obj/item/spacecash/c500 \
)
var/item3_type = pick( \
/obj/item/coin/silver, \
/obj/item/coin/silver, \
/obj/item/coin/gold, \
/obj/item/coin/iron, \
/obj/item/coin/iron, \
/obj/item/coin/iron \
)
if(item1_type)
new item1_type(src)
if(item2_type)
new item2_type(src)
if(item3_type)
new item3_type(src)
/obj/item/storage/wallet/sol_rich/fill()
..()
var/item1_type = pick(
/obj/item/spacecash/ewallet/c10000,
/obj/item/spacecash/ewallet/c5000,
/obj/item/spacecash/ewallet/c2000,
/obj/item/spacecash/c1000,
/obj/item/spacecash/c500,
)
var/item2_type = pick(
/obj/item/spacecash/ewallet/c5000,
/obj/item/spacecash/ewallet/c2000,
/obj/item/spacecash/c500,
)
var/item3_type = pick(
/obj/item/coin/silver,
/obj/item/coin/silver,
/obj/item/coin/gold,
)
new item1_type(src)
new item2_type(src)
new item3_type(src)
new /obj/item/clothing/accessory/badge/passport/sol(src)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+3
View File
@@ -62,6 +62,9 @@
base_icon = "chair_fancy"
held_item = /obj/item/material/stool/chair/fancy
/obj/structure/bed/stool/chair/padded
icon_state = "chair_padding"
/obj/structure/bed/stool/chair/padded/brown/New(var/newloc)
..(newloc, MATERIAL_STEEL, MATERIAL_LEATHER)