Skip to content

Commit

Permalink
Redoes KMC's ticket machine and allows it to be built. (#8833)
Browse files Browse the repository at this point in the history
* Re-does the ticket machine, and makes it obtainable in game

* Update ticketmachine.dm

* Update ticketmachine.dm

* Update ticketmachine.dm

* more ticket stuff

* Update ticketmachine.dm

* shifts a sprite over by 1 pixel

* Update yogstation.dme

* Update ticketmachine.dm

* Update EclipseStation.dmm

* Update ticketmachine.dm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update ticketmachine.dm

* Update code/modules/research/designs/misc_designs.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Update ticketmachine.dm

* Update ticketmachine.dm

* Tickets ding you

* Update EclipseStation.dmm

* Update EclipseStation.dmm

* Adds it back to eclipse, plus fixes a runtime

* Revert "Adds it back to eclipse, plus fixes a runtime"

This reverts commit 9483c1b.

* Revert "Update EclipseStation.dmm"

This reverts commit 12b1bea.

* Revert "Update EclipseStation.dmm"

This reverts commit 70fe97e.

* EEEEEE

* Update EclipseStation.dmm

* Apply suggestions from code review

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

* Destroying a ticket machine gets rid of all the tickets printed by it

* Update bureaucracy.dmi

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
  • Loading branch information
jcatjmeow and JamieD1 committed Jun 22, 2020
1 parent 731b5e2 commit 2e71e4e
Show file tree
Hide file tree
Showing 8 changed files with 194 additions and 192 deletions.
17 changes: 7 additions & 10 deletions _maps/map_files/EclipseStation/EclipseStation.dmm
Expand Up @@ -32186,10 +32186,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/security/checkpoint/auxiliary)
"bnL" = (
/obj/machinery/ticket_machine,
/turf/closed/wall,
/area/crew_quarters/heads/hop)
"bnM" = (
/obj/machinery/light{
dir = 1
Expand Down Expand Up @@ -33838,10 +33834,6 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"brd" = (
/obj/machinery/button/ticket_machine{
pixel_x = 24;
pixel_y = 36
},
/obj/machinery/button/door{
id = "hopqueue";
name = "Queue Shutters Control";
Expand Down Expand Up @@ -37329,6 +37321,7 @@
/area/maintenance/department/cargo)
"bxN" = (
/obj/structure/table,
/obj/item/ticket_machine_remote,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"bxO" = (
Expand Down Expand Up @@ -83376,6 +83369,10 @@
},
/turf/open/floor/plasteel,
/area/vacant_room/commissary)
"fpe" = (
/obj/machinery/ticket_machine,
/turf/open/floor/carpet/exoticblue,
/area/hallway/secondary/command)
"fra" = (
/obj/structure/cable{
icon_state = "4-8";
Expand Down Expand Up @@ -123364,7 +123361,7 @@ jSj
jSj
ccx
chQ
bnL
boS
boS
bpN
bqX
Expand Down Expand Up @@ -124389,7 +124386,7 @@ bNP
cjQ
bpV
bTm
bpV
fpe
blB
hxY
bxV
Expand Down
Expand Up @@ -442,6 +442,15 @@
build_path = /obj/machinery/paystand
req_components = list()

/obj/item/circuitboard/machine/ticketmachine
name = "Ticket Machine (Machine Board)"
icon_state = "generic"
desc = "You will also need a ticket machine remote to operate this."
build_path = /obj/machinery/ticket_machine
req_components = list(
/obj/item/hand_labeler = 1,
/obj/item/stack/sheet/glass = 1)

/obj/item/circuitboard/machine/protolathe
name = "Protolathe (Machine Board)"
icon_state = "generic"
Expand Down

0 comments on commit 2e71e4e

Please sign in to comment.