cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows Job and Species specific items to roll discounts (#25915)

Browse Source 
* Job and Species Discounts

* Condensed procs

* No His Grace discounts

* Better crates, no discounts for 10 TC or lower

* Removes extraneous bits

* Removed excess null, fixed out-of-scope discount floor change

* Documentation, null check, and a lot of snakes

* Reworked logic of where it does job/species checks

* Curly brackets begone

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Curly brackets begone pt2

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Removed for loops in job-species checks

* No freebies

* Early continues

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2024-08-04 04:01:35 -04:00
committed by GitHub
parent a21b962ee6
commit 88fbe41208
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/uplinks.dm
+5 -3
View File
@@ -26,19 +26,18 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/uplink_type = UPLINK_TYPE_TRAITOR
/// Whether the uplink is jammed and cannot be used to order items.
var/is_jammed = FALSE
/// Whether or not the uplink has generated its stock and discounts
var/items_generated = FALSE
/obj/item/uplink/ui_host()
return loc
/obj/item/uplink/proc/update_uplink_type(new_uplink_type)
uplink_type = new_uplink_type
uplink_items = get_uplink_items(src)
/obj/item/uplink/New()
..()
uses = 100
uplink_items = get_uplink_items(src)
GLOB.world_uplinks += src
/obj/item/uplink/Destroy()
@@ -58,6 +57,9 @@ GLOBAL_LIST_EMPTY(world_uplinks)
job = user.mind.assigned_role
if(!species)
species = user.dna.species.name
if(!items_generated)
uplink_items = get_uplink_items(src, user)
items_generated = TRUE
var/list/cats = list()