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

Merge remote-tracking branch 'upstream/master' into embed-changes

Browse Source
This commit is contained in:
Timothy Teakettle
2020-06-15 22:48:26 +01:00
parent c1d966ca44 1d3cad02ef
commit 7fbfb4ad0e
180 changed files with 5227 additions and 1997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/assist.dm
+3 -2
View File
@@ -14,7 +14,8 @@
/obj/item/stock_parts/cell/upgraded = 2)
premium = list(/obj/item/stock_parts/cell/upgraded/plus = 2,
/obj/item/flashlight/lantern = 2,
/obj/item/beacon = 2)
/obj/item/beacon = 2,
/obj/item/airlock_painter/decal = 5)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
refill_canister = /obj/item/vending_refill/assist
@@ -24,4 +25,4 @@
payment_department = NO_FREEBIES
/obj/item/vending_refill/assist
icon_state = "refill_engi"
icon_state = "refill_engi"
code/modules/vending/engivend.dm
+2 -1
View File
@@ -15,6 +15,7 @@
/obj/item/electronics/airalarm = 10,
/obj/item/electronics/firealarm = 10,
/obj/item/electronics/firelock = 10,
/obj/item/airlock_painter/decal = 5,
/obj/item/rcd_ammo = 3
)
contraband = list(/obj/item/stock_parts/cell/potato = 3,
@@ -35,4 +36,4 @@
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/engivend
icon_state = "refill_engi"
icon_state = "refill_engi"
code/modules/vending/kinkmate.dm
+5 -1
View File
@@ -20,7 +20,11 @@
/obj/item/clothing/under/misc/gear_harness = 10,
/obj/item/dildo/custom = 5,
/obj/item/electropack/shockcollar = 3,
/obj/item/assembly/signaler = 3
/obj/item/assembly/signaler = 3,
/obj/item/clothing/under/shorts/polychromic/pantsu,
/obj/item/clothing/under/misc/poly_bottomless,
/obj/item/clothing/under/misc/poly_tanktop,
/obj/item/clothing/under/misc/poly_tanktop/female
)
contraband = list(
/obj/item/clothing/neck/petcollar/locked = 2,
code/modules/vending/youtool.dm
+3 -2
View File
@@ -18,7 +18,8 @@
/obj/item/clothing/gloves/color/fyellow = 4,
/obj/item/multitool = 2)
premium = list(/obj/item/clothing/gloves/color/yellow = 2,
/obj/item/weldingtool/hugetank = 2)
/obj/item/weldingtool/hugetank = 2,
/obj/item/airlock_painter/decal = 3)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
refill_canister = /obj/item/vending_refill/tool
resistance_flags = FIRE_PROOF
@@ -28,4 +29,4 @@
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/tool
icon_state = "refill_engi"
icon_state = "refill_engi"