Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9c7a528
Update wheelchair.dm
maxion12345 Jul 22, 2021
b2467a9
Update wheelchair.dm
maxion12345 Jul 22, 2021
6371bdf
Merge branch 'yogstation13:master' into master
maxion12345 Aug 9, 2021
b88d759
Merge branch 'yogstation13:master' into master
maxion12345 Aug 22, 2021
e96c52c
Merge branch 'yogstation13:master' into master
maxion12345 Aug 24, 2021
467192a
Merge branch 'yogstation13:master' into master
maxion12345 Sep 2, 2021
303fc16
Merge branch 'yogstation13:master' into master
maxion12345 Sep 3, 2021
294cbdd
Merge branch 'yogstation13:master' into master
maxion12345 Sep 5, 2021
62ed24b
readds stuff
maxion12345 Sep 5, 2021
c99897e
re-commit maps
maxion12345 Sep 5, 2021
49d392c
Merge branch 'yogstation13-master' into genpop2
maxion12345 Sep 16, 2021
c619cdc
Revert "Merge branch 'yogstation13-master' into genpop2"
maxion12345 Sep 16, 2021
9de8074
Revert "re-commit maps"
maxion12345 Sep 16, 2021
ab33e02
Merge branch 'yogstation13:master' into genpop2
maxion12345 Sep 16, 2021
e9b4997
Merge branch 'yogstation13:master' into genpop2
maxion12345 Sep 18, 2021
5297b9a
YES!!! YES!!!
maxion12345 Sep 18, 2021
3c7de73
i make a fucky wucky with the access requirements
maxion12345 Sep 18, 2021
673118e
fix the ui :)
maxion12345 Sep 23, 2021
61fd6c6
Revert "i make a fucky wucky with the access requirements"
maxion12345 Sep 23, 2021
f36c102
Revert "YES!!! YES!!!"
maxion12345 Sep 23, 2021
43bef04
Merge branch 'yogstation13:master' into genpop2
maxion12345 Sep 23, 2021
d8b6925
i re-commit maps to fix conflict
maxion12345 Sep 23, 2021
8983bee
Update tgui/packages/tgui/interfaces/GenPop.js
JamieD1 Sep 23, 2021
595ac7c
Revert "i re-commit maps to fix conflict"
maxion12345 Sep 26, 2021
79f6388
Merge branch 'genpop2' of https://github.com/maxion12345/Yogstation i…
maxion12345 Sep 26, 2021
2d81ff6
Merge branch 'yogstation13:master' into genpop2
maxion12345 Sep 26, 2021
225b0f2
quick update to turnstile access
maxion12345 Sep 26, 2021
1b46891
Merge branch 'genpop2' of https://github.com/maxion12345/Yogstation i…
maxion12345 Sep 26, 2021
bca123e
maps re-done to remove general population cell
maxion12345 Sep 26, 2021
47b8330
update discharge message
maxion12345 Sep 26, 2021
8d933a0
updates process time
maxion12345 Sep 27, 2021
94ac946
revert changes to yogstation
maxion12345 Sep 27, 2021
0bd0f30
Merge branch 'yogstation13:master' into genpop2
maxion12345 Sep 27, 2021
4aeb09d
recommit yogstation
maxion12345 Sep 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
462 changes: 178 additions & 284 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

394 changes: 179 additions & 215 deletions _maps/map_files/YogStation/YogStation.dmm

Large diffs are not rendered by default.

435 changes: 213 additions & 222 deletions _maps/map_files/YogsDelta/YogsDelta.dmm

Large diffs are not rendered by default.

408 changes: 187 additions & 221 deletions _maps/map_files/Yogsmeta/Yogsmeta.dmm

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,5 @@
#define ACCESS_MECH_SCIENCE 303
#define ACCESS_MECH_ENGINE 304
#define ACCESS_MECH_FREEMINER 310
//Prisoner access for genpop system
#define ACCESS_PRISONER 311
7 changes: 6 additions & 1 deletion code/game/machinery/doors/turnstile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
/obj/machinery/turnstile/brig
name = "Brig turnstile"
//Seccies and brig phys may always pass, either way.
req_one_access = list(ACCESS_BRIG)
req_one_access = list(ACCESS_SEC_DOORS)

/obj/machinery/turnstile/genpop
name = "Cell turnstile"
//used for the actually cells
req_one_access = list(ACCESS_BRIG, ACCESS_PRISONER)

/obj/machinery/turnstile/Initialize()
. = ..()
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,17 @@ update_label("John Doe", "Clowny")
name = "mining ID"
access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)

/obj/item/card/id/genpop
name = "Genpop Prisoner ID card"
desc = "You are a number, you are not a free man."
icon_state = "orange"
item_state = "orange-id"
lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
assignment = "Prisoner"
registered_name = "Scum"
registered_age = null

/obj/item/card/id/away
name = "a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
Expand Down
343 changes: 343 additions & 0 deletions code/modules/security/genpop.dm

Large diffs are not rendered by default.

179 changes: 179 additions & 0 deletions tgui/packages/tgui/interfaces/GenPop.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
import { Fragment } from 'inferno';
import { useBackend } from '../backend';
import { Button, Section, ProgressBar, Flex } from '../components';
import { Window } from '../layouts';
import { toFixed } from 'common/math';

export const GenPop = (props, context) => {
const { act, data } = useBackend(context);
return (
<Window
resizable
width={625}
height={400}>
<Window.Content scrollable>
<Section
title="Prisoner ID Printer:"
buttons={(
<Fragment>
<Button
icon="cogs"
content="Enter a Custom Crime"
onClick={() => act("crime")} />
<Button
icon="id-card-alt"
content={data.desired_name ? data.desired_name : "Enter Prisoner Name"}
onClick={() => act("prisoner_name")} />
<Button
icon="print"
content="Finalize ID"
color="average"
disabled={!data.canPrint}
onClick={() => act('print')} />
</Fragment>
)}>
<Flex>
<Flex.Item>
<Button
icon="fast-backward"
onClick={() => act('time', { adjust: -120 })} />
<Button
icon="backward"
onClick={() => act('time', { adjust: -60 })} />
{' '}
{String(data.sentence / 60)} min:
{' '}
<Button
icon="forward"
onClick={() => act('time', { adjust: 60 })} />
<Button
icon="fast-forward"
onClick={() => act('time', { adjust: 120 })} />
<br />
<Button
icon="hourglass-start"
content="Short"
onClick={() => act('preset', { preset: 'short' })} />
<Button
icon="hourglass-start"
content="Medium"
onClick={() => act('preset', { preset: 'medium' })} />
<Button
icon="hourglass-start"
content="Long"
onClick={() => act('preset', { preset: 'long' })} />
<br />
</Flex.Item>
<Flex.Item>
<Section title="Current Inputted Crimes" width="385px">
{data.desired_crime}
</Section>
</Flex.Item>
</Flex>
</Section>
<Section title="Crimes">
<Flex direction="column">
<Flex.Item grow={1}>
{Object.keys(data.pettyCrimes).map(petty => {
let value = data.pettyCrimes[petty];
return (
<Button
key={petty}
content={value.name}
color={value.colour}
icon={value.icon}
tooltip={value.tooltip}
onClick={() => act('presetCrime', { preset: value.sentence, crime: value.name })} />
);
})}
</Flex.Item>
<Flex.Item>
<hr />
{Object.keys(data.minorCrimes).map(minor => {
let value = data.minorCrimes[minor];
return (
<Button
key={minor}
content={value.name}
color={value.colour}
icon={value.icon}
tooltip={value.tooltip}
onClick={() => act('presetCrime', { preset: value.sentence, crime: value.name })} />
);
})}
</Flex.Item>
<Flex.Item>
<hr />
{Object.keys(data.moderateCrimes).map(moderate => {
let value = data.moderateCrimes[moderate];
return (
<Button
key={moderate}
content={value.name}
color={value.colour}
icon={value.icon}
tooltip={value.tooltip}
onClick={() => act('presetCrime', { preset: value.sentence, crime: value.name })} />
);
})}
</Flex.Item>
<Flex.Item>
<hr />
{Object.keys(data.majorCrimes).map(major => {
let value = data.majorCrimes[major];
return (
<Button
key={major}
content={value.name}
color={value.colour}
icon={value.icon}
tooltip={value.tooltip}
onClick={() => act('presetCrime', { preset: value.sentence, crime: value.name })} />
);
})}
</Flex.Item>
<Flex.Item>
<hr />
{Object.keys(data.severeCrimes).map(severe => {
let value = data.severeCrimes[severe];
return (
<Button
key={severe}
content={value.name}
color={value.colour}
icon={value.icon}
tooltip={value.tooltip}
onClick={() => act('presetCrime', { preset: value.sentence, crime: value.name })} />
);
})}
</Flex.Item>
</Flex>
</Section>
<Section title="Prison Management:">
{Object.keys(data.allPrisoners).map(key => {
let value = data.allPrisoners[key];
return (
<Section key={value} title={value.name} buttons={
<Button
icon="hourglass-start"
content="Release"
onClick={() => act('release', { id: value.id })} />
}>
Incarcerated for: {value.crime} <br />
<ProgressBar
value={(value.served_time / value.sentence * 100) * 0.01}
ranges={{
good: [0.99, Infinity],
average: [0.40, 0.99],
bad: [-Infinity, 0.40],
}}>
{toFixed(value.served_time / 60)} min / {toFixed(value.sentence / 60)} min
</ProgressBar>
</Section>
);
})}
</Section>
</Window.Content>
</Window>
);
};
1 change: 1 addition & 0 deletions yogstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2904,6 +2904,7 @@
#include "code\modules\ruins\spaceruin_code\spacehotel.dm"
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
#include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm"
#include "code\modules\security\genpop.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
#include "code\modules\shuttle\arrivals.dm"
Expand Down