shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Porting Goofconomy & co.

Browse Source
This commit is contained in:
Ghommie
2020-04-17 07:48:11 +02:00
parent 19328b8710
commit 4c6f1b622b
190 changed files with 2213 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/ears/_ears.dm
+2
View File
@@ -6,6 +6,7 @@
throwforce = 0
slot_flags = ITEM_SLOT_EARS
resistance_flags = NONE
custom_price = 250
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
@@ -30,6 +31,7 @@
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD | ITEM_SLOT_NECK //Fluff item, put it whereever you want!
actions_types = list(/datum/action/item_action/toggle_headphones)
var/headphones_on = FALSE
custom_price = 125
/obj/item/clothing/ears/headphones/Initialize()
. = ..()
code/modules/clothing/gloves/color.dm
+2
View File
@@ -10,6 +10,8 @@
permeability_coefficient = 0.05
resistance_flags = NONE
var/can_be_cut = 1
custom_price = 1200
custom_premium_price = 1200
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
code/modules/clothing/gloves/miscellaneous.dm
+1
View File
@@ -10,6 +10,7 @@
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
strip_mod = 0.9
custom_price = 75
/obj/item/clothing/gloves/fingerless/pugilist
name = "armwraps"
code/modules/clothing/head/beanie.dm
+1
View File
@@ -5,6 +5,7 @@
name = "white beanie"
desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
icon_state = "beanie" //Default white
custom_price = 60
/obj/item/clothing/head/beanie/black
name = "black beanie"
code/modules/clothing/head/helmet.dm
+1
View File
@@ -58,6 +58,7 @@
desc = "A reliable, blue tinted helmet reminding you that you <i>still</i> owe that engineer a beer."
icon_state = "blueshift"
item_state = "blueshift"
custom_premium_price = 750
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
code/modules/clothing/head/misc.dm
+1
View File
@@ -129,6 +129,7 @@
dog_fashion = /datum/dog_fashion/head/pirate
/obj/item/clothing/head/pirate/captain
name = "pirate captain hat"
icon_state = "hgpiratecap"
item_state = "hgpiratecap"
code/modules/clothing/neck/_neck.dm
+36
View File
@@ -22,6 +22,7 @@
icon_state = "bluetie"
item_state = "" //no inhands
w_class = WEIGHT_CLASS_SMALL
custom_price = 60
/obj/item/clothing/neck/tie/blue
name = "blue tie"
@@ -87,6 +88,7 @@
/obj/item/clothing/neck/scarf //Default white color, same functionality as beanies.
name = "white scarf"
icon_state = "scarf"
custom_price = 60
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
dog_fashion = /datum/dog_fashion/head
@@ -251,6 +253,40 @@
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
/obj/item/clothing/neck/necklace/dope/merchant
desc = "Don't ask how it works, the proof is in the holochips!"
/// scales the amount received in case an admin wants to emulate taxes/fees.
var/profit_scaling = 1
/// toggles between sell (TRUE) and get price post-fees (FALSE)
var/selling = FALSE
/obj/item/clothing/neck/necklace/dope/merchant/attack_self(mob/user)
. = ..()
selling = !selling
to_chat(user, "<span class='notice'>[src] has been set to [selling ? "'Sell'" : "'Get Price'"] mode.</span>")
/obj/item/clothing/neck/necklace/dope/merchant/afterattack(obj/item/I, mob/user, proximity)
. = ..()
if(!proximity)
return
var/datum/export_report/ex = export_item_and_contents(I, allowed_categories = (ALL), dry_run=TRUE)
var/price = 0
for(var/x in ex.total_amount)
price += ex.total_value[x]
if(price)
var/true_price = round(price*profit_scaling)
to_chat(user, "<span class='notice'>[selling ? "Sold" : "Getting the price of"] [I], value: <b>[true_price]</b> credits[I.contents.len ? " (exportable contents included)" : ""].[profit_scaling < 1 && selling ? "<b>[round(price-true_price)]</b> credit\s taken as processing fee\s." : ""]</span>")
if(selling)
new /obj/item/holochip(get_turf(user),true_price)
for(var/i in ex.exported_atoms_ref)
var/atom/movable/AM = i
if(QDELETED(AM))
continue
qdel(AM)
else
to_chat(user, "<span class='warning'>There is no export value for [I] or any items within it.</span>")
//////////////////////////////////
//VERY SUPER BADASS NECKERCHIEFS//
//////////////////////////////////
code/modules/clothing/outfits/vr.dm
+11 -4
View File
@@ -3,15 +3,21 @@
uniform = /obj/item/clothing/under/color/random
shoes = /obj/item/clothing/shoes/sneakers/black
ears = /obj/item/radio/headset
id = /obj/item/card/id
id = /obj/item/card/id/locked_banking
var/starting_funds = 350
/datum/outfit/vr/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
H.dna.species.before_equip_job(null, H)
/datum/outfit/vr/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
var/obj/item/card/id/id = H.wear_id
if (istype(id))
id.access |= get_all_accesses()
if(!istype(id))
return
id.access |= get_all_accesses()
if(id.registered_account)
id.registered_account.account_holder = "[H.real_name] (VR)"
if(starting_funds && id.bank_support == ID_LOCKED_BANK_ACCOUNT) //No payroll or ability to virtually transfer funds to an external account.
id.registered_account.adjust_money(starting_funds)
/datum/outfit/vr/syndicate
name = "Syndicate VR Operative - Basic"
@@ -19,11 +25,12 @@
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack
id = /obj/item/card/id/syndicate
id = /obj/item/card/id/syndicate/locked_banking
belt = /obj/item/gun/ballistic/automatic/pistol
l_pocket = /obj/item/paper/fluff/vr/fluke_ops
backpack_contents = list(/obj/item/storage/box/syndie=1,\
/obj/item/kitchen/knife/combat/survival)
starting_funds = 0 //Should be operating, not shopping.
/datum/outfit/vr/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
. = ..()
code/modules/clothing/shoes/colour.dm
+1
View File
@@ -1,5 +1,6 @@
/obj/item/clothing/shoes/sneakers
dying_key = DYE_REGISTRY_SNEAKERS
custom_price = 50
/obj/item/clothing/shoes/sneakers/black
name = "black shoes"
code/modules/clothing/shoes/miscellaneous.dm
+2
View File
@@ -71,6 +71,7 @@
equip_delay_other = 50
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 75)
custom_price = 600
/obj/item/clothing/shoes/galoshes/dry
name = "absorbent galoshes"
@@ -371,6 +372,7 @@
/obj/item/clothing/shoes/cowboyboots
name = "cowboy boots"
desc = "A standard pair of brown cowboy boots."
custom_price = 60 //remember to replace these lame cosmetics with tg's YEEEEHAW counterparts.
icon_state = "cowboyboots"
/obj/item/clothing/shoes/cowboyboots/black
code/modules/clothing/suits/armor.dm
+1
View File
@@ -47,6 +47,7 @@
desc = "A large, yet comfortable piece of armor, protecting you from some threats."
icon_state = "blueshift"
item_state = "blueshift"
custom_premium_price = 750
/obj/item/clothing/suit/armor/hos
name = "armored greatcoat"
code/modules/clothing/under/miscellaneous.dm
+1
View File
@@ -86,6 +86,7 @@
icon_state = "overalls"
item_state = "lb_suit"
can_adjust = FALSE
custom_price = 60
/obj/item/clothing/under/misc/assistantformal
name = "assistant's formal uniform"
code/modules/clothing/under/pants.dm
+2
View File
@@ -3,6 +3,7 @@
body_parts_covered = GROIN|LEGS
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
custom_price = 60
/obj/item/clothing/under/pants/classicjeans
name = "classic jeans"
@@ -13,6 +14,7 @@
name = "Must Hang jeans"
desc = "Made in the finest space jeans factory this side of Alpha Centauri."
icon_state = "jeansmustang"
custom_price = 180
/obj/item/clothing/under/pants/blackjeans
name = "black jeans"
code/modules/clothing/under/skirt_dress.dm
+4
View File
@@ -15,6 +15,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
custom_price = 60
/obj/item/clothing/under/dress/skirt/red
name = "red skirt"
@@ -24,6 +25,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
custom_price = 60
/obj/item/clothing/under/dress/skirt/purple
name = "purple skirt"
@@ -33,6 +35,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
custom_price = 60
/obj/item/clothing/under/dress/sundress
name = "sundress"
@@ -146,6 +149,7 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
alt_covers_chest = TRUE
custom_price = 60
/obj/item/clothing/under/dress/skirt/plaid/blue
name = "blue plaid skirt"