cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-20 04:02:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with"

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:38:30 -06:00
committed by GitHub
parent f6f3a63b4e
commit eaaca202a6
60 changed files with 187 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/obj/condom.dm
+2 -2
View File
@@ -7,9 +7,9 @@
icon = 'hyperstation/icons/obj/condom.dmi'
throwforce = 0
icon_state = "b_condom_wrapped"
var/unwrapped = 0
var/unwrapped = 0
w_class = WEIGHT_CLASS_TINY
economy_type = ECONOMY_PRICE_LOW
price = 1
obj/item/condom/Initialize()
create_reagents(300, DRAWABLE|NO_REACT)
hyperstation/code/obj/economy.dm
+12 -13
View File
@@ -18,7 +18,6 @@
light_power = 0
light_range = 7
light_color = COLOR_VIVID_RED
var/pin = 0
/obj/machinery/atm/ui_interact(mob/user)
@@ -40,7 +39,7 @@
if(idcard.registered_account)
if(!idcard.registered_account.account_pin || pin == idcard.registered_account.account_pin)
dat += "<p>Balance: <b>$[idcard.registered_account.balance]</b>"
dat += "<p>Balance: <b>$[idcard.registered_account.account_balance]</b>"
//dat += "<p>Offstation Balance: <b()</b>"
dat += "<p>"
dat += "<a href='byond://?src=[REF(src)];withdraw=1'>Withdraw</A>"
@@ -73,15 +72,15 @@
user = idcard.registered_name
pin = ""
playsound(src, 'sound/machines/button.ogg', 50, FALSE)
ui_interact(usr)
src.ui_interact(usr)
if(istype(I, /obj/item/stack/credits)) //feed money back into the machine! dont need a pin to donate stuff.
if(held_card)
var/obj/item/stack/credits/cred = I
var/obj/item/card/id/idcard = held_card
idcard.registered_account.balance = (idcard.registered_account.balance+cred.amount)
idcard.registered_account.account_balance = (idcard.registered_account.account_balance+cred.amount)
to_chat(usr, "<span class='notice'>You insert [cred] into the ATM.</span>")
ui_interact(usr)
src.ui_interact(usr)
del(cred)
/obj/machinery/atm/Topic(href, href_list)
@@ -107,29 +106,29 @@
var/pininput = input(user, "Input pin", "Pin Number") as num|null
if(pininput)
if(pininput > 9999 || pininput < 1000)
to_chat(usr, "<span class='notice'>[src] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
to_chat(usr, "<span class='notice'>[src.name] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
return
pin = max(min( round(text2num(pininput)), 9999),1000) //4 numbers or less.
var/obj/item/card/id/idcard = held_card
if(pin == idcard.registered_account.account_pin)
to_chat(usr, "<span class='notice'>[src] beeps, accepting the pin.</span>")
to_chat(usr, "<span class='notice'>[src.name] beeps, accepting the pin.</span>")
else
to_chat(usr, "<span class='notice'>[src] buzzes, denying the pin.</span>")
to_chat(usr, "<span class='notice'>[src.name] buzzes, denying the pin.</span>")
if(href_list["changepin"])
playsound(src, get_sfx("terminal_type"), 25, 1)
var/pinchange = input(user, "Input pin", "Pin Number") as num|null
if(pinchange > 9999 || pinchange < 1000)
to_chat(usr, "<span class='warning'>[src], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
to_chat(usr, "<span class='warning'>[src.name], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
return
if(pinchange)
var/pinchange2 = input(user, "Confirm pin", "Confirm pin") as num|null //time to confirm!
if(pinchange == pinchange2)
var/obj/item/card/id/idcard = held_card
idcard.registered_account.account_pin = pinchange
to_chat(usr, "<span class='notice'>[src] beeps, your pin has been changed to [pinchange]!.</span>")
to_chat(usr, "<span class='notice'>[src.name] beeps, your pin has been changed to [pinchange]!.</span>")
else
to_chat(usr, "<span class='warning'>[src] buzzes, your pins did not match!</span>")
to_chat(usr, "<span class='warning'>[src.name] buzzes, your pins did not match!</span>")
pin = ""
if(href_list["withdraw"])
@@ -139,9 +138,9 @@
if(idcard.registered_account)
var/amount = input(user, "Choose amount", "Withdraw") as num|null
if(amount>0)
amount = max(min( round(text2num(amount)), idcard.registered_account.balance),0) //make sure they aint taking out more then what they have
amount = max(min( round(text2num(amount)), idcard.registered_account.account_balance),0) //make sure they aint taking out more then what they have
to_chat(usr, "<span class='notice'>The machine prints out [amount] credits.</span>")
idcard.registered_account.balance = (idcard.registered_account.balance-amount) //subtract the amount they took out.
idcard.registered_account.account_balance = (idcard.registered_account.account_balance-amount) //subtract the amount they took out.
var/obj/item/stack/credits/C = new /obj/item/stack/credits/(loc)
C.amount = amount
if(usr.put_in_hands(C))
hyperstation/code/obj/fleshlight.dm
+10 -13
View File
@@ -10,11 +10,10 @@
icon_state = "fleshlight_base"
item_state = "fleshlight"
w_class = WEIGHT_CLASS_SMALL
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.95
var/inuse = 0
var/sleevecolor = "#ffcbd4" //pink
price = 8
var/mutable_appearance/sleeve
var/inuse = 0
/obj/item/fleshlight/examine(mob/user)
. = ..()
@@ -79,11 +78,10 @@
icon_state = "unpaired"
item_state = "fleshlight"
w_class = WEIGHT_CLASS_SMALL
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 1.2
var/partnercolor = "#ffcbd4"
var/partnerbase = "normal"
var/partnerorgan = "portal_vag"
price = 20
var/mutable_appearance/sleeve
var/mutable_appearance/organ
var/inuse = 0
@@ -98,7 +96,7 @@
else
. += "<span class='notice'>The device is paired, and awaiting input. </span>"
/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder)
/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder)
if(inuse) //just to stop stacking and causing people to cum instantly
return
if(!UpdateUsability())
@@ -113,8 +111,8 @@
if(option == "Fuck" && !P.is_exposed())
to_chat(holder, "<span class='notice'>You don't see anywhere to use this on.</span>")
return
/*
WARMUP START - prevents spam/instant climax
/*
WARMUP START - prevents spam/instant climax
*/
inuse = TRUE
if(user != holder)
@@ -124,8 +122,8 @@
inuse = FALSE
return
inuse = FALSE
/*
WARMUP END - proceed with the action
/*
WARMUP END - proceed with the action
*/
switch(option)
if("Fuck")
@@ -142,7 +140,7 @@
user.adjustArousalLoss(20)
target.adjustArousalLoss(20)
target.do_jitter_animation()
if(target.can_orgasm() && prob(5))
if(target.can_orgasm() && prob(5))
target.mob_climax_outside(target_genital, spillage=target_genital.is_exposed())
if(user.can_orgasm())
var/mob/living/carbon/human/O = user
@@ -278,8 +276,7 @@
icon = 'hyperstation/icons/obj/fleshlight.dmi'
desc = "A small silver box with Silver Love Co embossed."
icon_state = "box"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 1.5
price = 15
// portal fleshlight box
/obj/item/storage/box/portallight/PopulateContents()
hyperstation/code/obj/kinkyclothes.dm
+4 -8
View File
@@ -6,16 +6,14 @@
icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.75
price = 5
/obj/item/clothing/gloves/latexsleeves/security
name = "security sleeves"
desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team."
icon_state = "latexsec"
item_state = "latexsec"
economy_type = ECONOMY_PRICE_EROTIC
economy_price_mul = 0.75
price = 5
/obj/item/clothing/head/dominatrixcap
name = "dominatrix cap"
@@ -47,8 +45,7 @@ obj/item/clothing/neck/stole
w_class = WEIGHT_CLASS_SMALL
icon_state = "stole"
item_state = "" //no inhands
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.75
price = 3
obj/item/clothing/neck/stole/black
name = "black boa"
@@ -58,8 +55,7 @@ obj/item/clothing/neck/stole/black
icon_state = "stole"
item_state = "" //no inhands
color = "#3d3d3d"
economy_type = ECONOMY_PRICE_EXPENSIVE
economy_price_mul = 0.75
price = 3
/obj/item/clothing/suit/fluffyhalfcrop
name = "fluffy half-crop jacket"
hyperstation/code/obj/rope.dm
+1 -2
View File
@@ -10,8 +10,7 @@
item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
cuffsound = 'sound/weapons/cablecuff.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
economy_type = ECONOMY_PRICE_LOW
economy_price_mul = 1.25
price = 2
/mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
var/mob/living/carbon/M = source
hyperstation/code/obj/sounding.dm
+2 -2
View File
@@ -4,9 +4,9 @@
icon = 'hyperstation/icons/obj/sounding.dmi'
throwforce = 0
icon_state = "sounding_wrapped"
var/unwrapped = 0
var/unwrapped = 0
w_class = WEIGHT_CLASS_TINY
economy_type = ECONOMY_PRICE_LOW
price = 1
/obj/item/sounding/attack_self(mob/user)
if(!istype(user))
hyperstation/code/obj/vibrator.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/style = "long"
var/inside = FALSE
var/last = 0
economy_type = ECONOMY_PRICE_EROTIC
price = 3
/obj/item/electropack/vibrator/Initialize() //give the device its own code
. = ..()