Skip to content

Commit

Permalink
Merge pull request #20 from ARF-SS13/fenwork
Browse files Browse the repository at this point in the history 
Fenwork
  • Loading branch information
@Tk420634
Tk420634 authored Jul 17, 2024
2 parents 94696e9 + 668b948 commit 28f4cae
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 68 deletions.
20 changes: 16 additions & 4 deletions _maps/map_files/coyote_bayou/foxybarupper.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3081,7 +3081,10 @@
/obj/effect/turf_decal/siding/wood{
color = "#3B2B1A"
},
/obj/item/kirbyplants/random,
/obj/machinery/computer/arcade{
density = 0;
dir = 1
},
/turf/open/floor/carpet/black,
/area/f13/fb/bar)
"NE" = (
Expand Down Expand Up @@ -4123,6 +4126,15 @@
},
/turf/open/floor/carpet/black,
/area/f13/fb/bar)
"YP" = (
/obj/machinery/light/floor{
light_color = "#444499";
color = "#444499";
alpha = 10
},
/obj/structure/chair/stool/retro/tan,
/turf/open/floor/carpet/black,
/area/f13/fb/bar)
"YQ" = (
/obj/structure/table/glass,
/turf/open/floor/wood_common/wood_common_dark,
Expand Down Expand Up @@ -6002,7 +6014,7 @@ nZ
il
kX
zr
zr
YP
NB
il
YQ
Expand Down Expand Up @@ -6119,7 +6131,7 @@ il
il
Ib
zr
LC
ph
UB
il
iA
Expand Down Expand Up @@ -6236,7 +6248,7 @@ uu
il
nX
zr
ph
zr
UB
il
wM
Expand Down
49 changes: 4 additions & 45 deletions code/game/machinery/computer/arcade.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,9 @@
icon_screen = "invaders"
clockwork = TRUE //it'd look weird
var/list/prizes = list(
/obj/item/toy/balloon = ARCADE_WEIGHT_USELESS,
/obj/item/toy/beach_ball = ARCADE_WEIGHT_USELESS,
/obj/item/toy/cattoy = ARCADE_WEIGHT_USELESS,
/obj/item/toy/clockwork_watch = ARCADE_WEIGHT_TRICK,
/obj/item/toy/dummy = ARCADE_WEIGHT_TRICK,
/obj/item/toy/eightball = ARCADE_WEIGHT_USELESS,
/obj/item/toy/eightball/haunted = ARCADE_WEIGHT_RARE,
/obj/item/storage/box/actionfigure = ARCADE_WEIGHT_USELESS,
/obj/item/toy/foamblade = ARCADE_WEIGHT_TRICK,
/obj/item/toy/gun = ARCADE_WEIGHT_TRICK,
/obj/item/toy/katana = ARCADE_WEIGHT_TRICK,
/obj/item/toy/minimeteor = ARCADE_WEIGHT_TRICK,
/obj/item/toy/nuke = ARCADE_WEIGHT_TRICK,
/obj/item/toy/redbutton = ARCADE_WEIGHT_TRICK,
/obj/item/toy/spinningtoy = ARCADE_WEIGHT_TRICK,
/obj/item/toy/sword = ARCADE_WEIGHT_TRICK,
/obj/item/toy/talking/AI = ARCADE_WEIGHT_USELESS,
/obj/item/toy/talking/codex_gigas = ARCADE_WEIGHT_USELESS,
/obj/item/toy/talking/griffin = ARCADE_WEIGHT_USELESS,
/obj/item/toy/talking/owl = ARCADE_WEIGHT_USELESS,
/obj/item/toy/toy_dagger = ARCADE_WEIGHT_TRICK,
/obj/item/toy/toy_xeno = ARCADE_WEIGHT_TRICK,
/obj/item/toy/windupToolbox = ARCADE_WEIGHT_TRICK,

/mob/living/simple_animal/bot/secbot/grievous/toy = ARCADE_WEIGHT_RARE,
/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = ARCADE_WEIGHT_TRICK,
/obj/item/hot_potato/harmless/toy = ARCADE_WEIGHT_RARE,
/obj/item/dualsaber/toy = ARCADE_WEIGHT_RARE,
/obj/item/dualsaber/hypereutactic/toy = ARCADE_WEIGHT_RARE,
/obj/item/dualsaber/hypereutactic/toy/rainbow = ARCADE_WEIGHT_RARE,

/obj/item/storage/box/snappops = ARCADE_WEIGHT_TRICK,
/obj/item/clothing/under/syndicate/tacticool = ARCADE_WEIGHT_TRICK,
/obj/item/storage/crayons = ARCADE_WEIGHT_USELESS,
/obj/item/coin/antagtoken = ARCADE_WEIGHT_USELESS,
/obj/item/stack/tile/fakespace/loaded = ARCADE_WEIGHT_TRICK,
/obj/item/stack/tile/fakepit/loaded = ARCADE_WEIGHT_TRICK,
/obj/item/restraints/handcuffs/fake = ARCADE_WEIGHT_TRICK,
/obj/item/clothing/shoes/kindleKicks = ARCADE_WEIGHT_RARE,
/obj/item/storage/belt/military/snack = ARCADE_WEIGHT_RARE,

/obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE,
// /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake = ARCADE_WEIGHT_TRICK,
/obj/item/clothing/suit/hooded/wintercoat/narsie/fake = ARCADE_WEIGHT_TRICK
/obj/item/stack/f13Cash/random = ARCADE_WEIGHT_TRICK,
/obj/item/stack/f13Cash/random = ARCADE_WEIGHT_USELESS,
/obj/item/stack/f13Cash/random = ARCADE_WEIGHT_RARE,
)
connectable = FALSE

Expand All @@ -70,7 +29,7 @@
if(!circuit)
var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 33,
/obj/item/circuitboard/computer/arcade/orion_trail = 33,
/obj/item/circuitboard/computer/arcade/amputation = 33)
)
var/thegame = pickweight(gameodds)
var/obj/item/circuitboard/CB = new thegame()
var/obj/machinery/computer/arcade/A = new CB.build_path(loc, CB)
Expand Down
36 changes: 18 additions & 18 deletions code/modules/WVM/wvm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,15 +1005,15 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
// new /datum/data/wasteland_equipment("Union Scrip x200", /obj/item/stack/f13Cash/ncr/twohundo, 110),
// new /datum/data/wasteland_equipment("Union Scrip x1000", /obj/item/stack/f13Cash/ncr/onekay, 550),
// new /datum/data/wasteland_equipment("Union Scrip x5000", /obj/item/stack/f13Cash/ncr/fivegees, 2750),
new /datum/data/wasteland_equipment("Silver Dollar x1", /obj/item/stack/f13Cash/denarius, 11),
new /datum/data/wasteland_equipment("Silver Dollar x5", /obj/item/stack/f13Cash/denarius/five, 55),
new /datum/data/wasteland_equipment("Silver Dollar x10", /obj/item/stack/f13Cash/denarius/ten, 110),
new /datum/data/wasteland_equipment("Silver Dollar x20", /obj/item/stack/f13Cash/denarius/twenty, 220),
new /datum/data/wasteland_equipment("Silver Dollar x100", /obj/item/stack/f13Cash/denarius/hundo, 1100),
new /datum/data/wasteland_equipment("Golden Thaler x1", /obj/item/stack/f13Cash/aureus, 110),
new /datum/data/wasteland_equipment("Golden Thaler x5", /obj/item/stack/f13Cash/aureus/five, 550),
new /datum/data/wasteland_equipment("Golden Thaler x10", /obj/item/stack/f13Cash/aureus/ten, 1100),
new /datum/data/wasteland_equipment("Golden Thaler x100", /obj/item/stack/f13Cash/aureus/hundo, 11000),
new /datum/data/wasteland_equipment("Silver Dollar x1", /obj/item/stack/f13Cash/denarius, 10),
new /datum/data/wasteland_equipment("Silver Dollar x5", /obj/item/stack/f13Cash/denarius/five, 50),
new /datum/data/wasteland_equipment("Silver Dollar x10", /obj/item/stack/f13Cash/denarius/ten, 100),
new /datum/data/wasteland_equipment("Silver Dollar x20", /obj/item/stack/f13Cash/denarius/twenty, 200),
new /datum/data/wasteland_equipment("Silver Dollar x100", /obj/item/stack/f13Cash/denarius/hundo, 1000),
new /datum/data/wasteland_equipment("Golden Thaler x1", /obj/item/stack/f13Cash/aureus, 100),
new /datum/data/wasteland_equipment("Golden Thaler x5", /obj/item/stack/f13Cash/aureus/five, 500),
new /datum/data/wasteland_equipment("Golden Thaler x10", /obj/item/stack/f13Cash/aureus/ten, 1000),
new /datum/data/wasteland_equipment("Golden Thaler x100", /obj/item/stack/f13Cash/aureus/hundo, 10000),
/*new /datum/data/wasteland_equipment("Low Roller Bounty Ticket", /obj/item/card/lowbounty, 120), // Disabled to prevent money duping through cargo
new /datum/data/wasteland_equipment("Medium Roller Bounty Ticket", /obj/item/card/midbounty, 240),
new /datum/data/wasteland_equipment("High Roller Bounty Ticket", /obj/item/card/highbounty, 480),
Expand All @@ -1027,15 +1027,15 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
// new /datum/data/wasteland_equipment("Union Scrip x200", /obj/item/stack/f13Cash/ncr/twohundo, 110),
// new /datum/data/wasteland_equipment("Union Scrip x1000", /obj/item/stack/f13Cash/ncr/onekay, 550),
// new /datum/data/wasteland_equipment("Union Scrip x5000", /obj/item/stack/f13Cash/ncr/fivegees, 2750),
new /datum/data/wasteland_equipment("Silver Dollar x1", /obj/item/stack/f13Cash/denarius, 11),
new /datum/data/wasteland_equipment("Silver Dollar x5", /obj/item/stack/f13Cash/denarius/five, 55),
new /datum/data/wasteland_equipment("Silver Dollar x10", /obj/item/stack/f13Cash/denarius/ten, 110),
new /datum/data/wasteland_equipment("Silver Dollar x20", /obj/item/stack/f13Cash/denarius/twenty, 220),
new /datum/data/wasteland_equipment("Silver Dollar x100", /obj/item/stack/f13Cash/denarius/hundo, 1100),
new /datum/data/wasteland_equipment("Golden Thaler x1", /obj/item/stack/f13Cash/aureus, 110),
new /datum/data/wasteland_equipment("Golden Thaler x5", /obj/item/stack/f13Cash/aureus/five, 550),
new /datum/data/wasteland_equipment("Golden Thaler x10", /obj/item/stack/f13Cash/aureus/ten, 1100),
new /datum/data/wasteland_equipment("Golden Thaler x100", /obj/item/stack/f13Cash/aureus/hundo, 11000),
new /datum/data/wasteland_equipment("Silver Dollar x1", /obj/item/stack/f13Cash/denarius, 10),
new /datum/data/wasteland_equipment("Silver Dollar x5", /obj/item/stack/f13Cash/denarius/five, 50),
new /datum/data/wasteland_equipment("Silver Dollar x10", /obj/item/stack/f13Cash/denarius/ten, 100),
new /datum/data/wasteland_equipment("Silver Dollar x20", /obj/item/stack/f13Cash/denarius/twenty, 200),
new /datum/data/wasteland_equipment("Silver Dollar x100", /obj/item/stack/f13Cash/denarius/hundo, 1000),
new /datum/data/wasteland_equipment("Golden Thaler x1", /obj/item/stack/f13Cash/aureus, 100),
new /datum/data/wasteland_equipment("Golden Thaler x5", /obj/item/stack/f13Cash/aureus/five, 500),
new /datum/data/wasteland_equipment("Golden Thaler x10", /obj/item/stack/f13Cash/aureus/ten, 1000),
new /datum/data/wasteland_equipment("Golden Thaler x100", /obj/item/stack/f13Cash/aureus/hundo, 10000),
/*new /datum/data/wasteland_equipment("Low Roller Bounty Ticket", /obj/item/card/lowbounty, 120),
new /datum/data/wasteland_equipment("Medium Roller Bounty Ticket", /obj/item/card/midbounty, 240),
new /datum/data/wasteland_equipment("High Roller Bounty Ticket", /obj/item/card/highbounty, 480),
Expand Down
3 changes: 2 additions & 1 deletion modular_coyote/code/modules/examine_images.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ GLOBAL_LIST_INIT(pfp_filehost_prefix, list(
))
GLOBAL_LIST_INIT(pfp_filehost_safe_suffixes, list(
".png",
".jpg"
".jpg",
".gif"
))
#define SUFFIX_LENGTH 4
#define LEGACY_PREFIX ".png"
Expand Down

0 comments on commit 28f4cae

Please sign in to comment.