Skip to content

Commit

Permalink
Removes gambling until we're able to determine why it's breaking the …
Browse files Browse the repository at this point in the history
…server (#595)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Killswitches slot machines and comments out all references to it
@Metekillot until we're able to pinpoint why gambling seems to be
breaking the server

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: no more gambling
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
cheapcents authored Jan 24, 2025
1 parent a7a22e9 commit af1c0b9
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 344 deletions.
319 changes: 0 additions & 319 deletions code/game/machinery/slotmachine.dm

This file was deleted.

3 changes: 1 addition & 2 deletions code/game/objects/effects/spawners/lootdrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,7 @@
/obj/item/circuitboard/machine/mining_equipment_vendor,
/obj/item/circuitboard/machine/microwave,
/obj/item/circuitboard/machine/chem_dispenser/drinks,
/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
/obj/item/circuitboard/computer/slot_machine
/obj/item/circuitboard/machine/chem_dispenser/drinks/beer
)

/obj/effect/spawner/lootdrop/techstorage/rnd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,6 @@
icon_state = "generic"
build_path = /obj/machinery/computer/pod

/obj/item/circuitboard/computer/slot_machine
name = "Slot Machine (Computer Board)"
icon_state = "generic"
build_path = /obj/machinery/computer/slot_machine

/obj/item/circuitboard/computer/swfdoor
name = "Magix (Computer Board)"
icon_state = "generic"
Expand Down
8 changes: 0 additions & 8 deletions code/modules/research/designs/comp_board_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/slot_machine
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
id = "slotmachine"
build_path = /obj/item/circuitboard/computer/slot_machine
category = list("Computer Boards")


/datum/design/board/powermonitor
name = "Computer Design (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor."
Expand Down
6 changes: 0 additions & 6 deletions code/modules/vtmb/dharma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,6 @@
return
if(last_rage_hit+50 < world.time)
last_rage_hit = world.time
if(istype(mind?.dharma?.Po_Focus, /obj/machinery/computer/slot_machine))
var/obj/machinery/computer/slot_machine/slot = mind?.dharma?.Po_Focus
for(var/obj/item/stack/dollar/D in src)
if(D)
slot.attackby(D, src)
slot.spin(src)
else
step_to(src, mind?.dharma?.Po_Focus, 0)
face_atom(mind?.dharma?.Po_Focus)
Expand Down
3 changes: 0 additions & 3 deletions code/modules/vtmb/kuei_jin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,6 @@
H.mind.dharma.roll_po(trigger2, H)
COOLDOWN_START(H.mind.dharma, po_call, 5 SECONDS)

for(var/obj/machinery/computer/slot_machine/slot in view(5, H))
if(slot)
trigger3 = slot
if(trigger3)
H.mind.dharma.roll_po(trigger3, H)
COOLDOWN_START(H.mind.dharma, po_call, 5 SECONDS)
Expand Down
1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,6 @@
#include "code\game\machinery\sheetifier.dm"
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\Sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
#include "code\game\machinery\spaceheater.dm"
#include "code\game\machinery\stasis.dm"
#include "code\game\machinery\status_display.dm"
Expand Down

0 comments on commit af1c0b9

Please sign in to comment.