cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 10:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
198 Commits
Author SHA1 Message Date
Henri215andGitHub dc75a748f1 Fixing common spelling mistakes part 3 (#20870) 
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
 2023-04-22 09:44:27 +02:00
SilverplateandGitHub 0c3a555bd4 Corrects cash input text for arcade machines (#20827) 
* Correct amount shown

* Simplifed as per Syrryan's comment

* corrects grammar when adding 1 credit
 2023-04-22 09:43:29 +02:00
GDNandGitHub 1475b3cba4 fixes an EFTPOS runtime if there's no connected account (#20456) 
* fixes an EFTPOS runtime if there's no connected account

* ryan review
 2023-02-27 10:58:09 -06:00
RyanGitHubHenri215Vi3trice
 		a7848ee5be EFTPOS Tweaks + TGUI makeover (#20095) 
* eftpos changes

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* request changes

* tgui rebuild

* Update code/modules/economy/economy_machinery/eftpos.dm

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
 2023-02-22 18:26:02 -06:00
Vi3triceGitHubRyan
 		f428cee612 Adds the cash register (#20138) 
* You asked

* Tweaks

* Update eftpos.dm

* Adding registers

* good luck meta you'll need it

* Update eftpos.dm

* More sounds

* More sounds, you can pay as long as you're close to the register.

* Tone down the edits, chefs will figure it out

* tim allen grunt

* Update eftpos.dm

* Update eftpos.dm

* Update code/modules/economy/economy_machinery/eftpos.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Ceres is a thing now

* Fix merge

* Update eftpos.dm

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-02-14 10:14:10 +00:00
RyanGitHubHenri215
 		7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991) 
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-01-30 22:28:10 +00:00
RyanGitHubHenri215
 		748405409d Adds better use feedback to Nanobank and Pin Changing (#20084) 
* guh

* Update code/modules/economy/economy_machinery/account_terminal.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-01-13 16:27:43 +01:00
Henri215andGitHub e711cd5921 Fixes lots of common spelling mistakes (#20086) 
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
 2023-01-08 20:12:31 -05:00
AffectedArc07andGitHub e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006) 
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
 2022-12-29 14:28:40 +00:00
GDNandGitHub 6486a7e109 sanity check to the ATM qdel (#20009) 2022-12-28 14:57:19 -05:00
Sirryan2002andGitHub c21a050c74 Adds an Economy Manager to the Admin Event Panel (#19785) 
* Economy Event Panel

* fixin' stuff

* request changes

* oops
 2022-12-24 17:47:49 +01:00
ContrabangandGitHub 712f76b5bb small fix (#19949) 2022-12-24 11:02:12 -05:00
McRamonGitHubSirryan2002
 		0deaf46e1a Flags resprite (#19844) 
* first icons

* more icons

* fire

* solgov and ussp flag icons

* Hope i did it right

* fix

* Update flag.dm

* inhands_right

* inhands_left

* something

* aha

* missing_inhands

* Update code/modules/supply/supply_packs/pack_miscellaneous.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update flags_lefthand.dmi

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-13 16:47:16 +00:00
ContrabangandGitHub ea47871561 Improves usability of the Accounts Uplink Terminal (#19826) 
* adds stuff to the machine

* oops forgot to rebuild
 2022-12-12 17:00:51 -05:00
FloFluoroandGitHub 5912278a08 ATMs can now be cmagged (#19762) 2022-11-25 21:13:00 +01:00
Sirryan2002GitHubAffectedArc07Farie82Henri215Luc
 		61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
Vi3triceandGitHub 59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Henri215andGitHub 233657d8be ATM and id console will use your inactive hand for giving items (#19164) 2022-10-02 22:10:12 -05:00
ContrabangandGitHub 9bab3450cd why is it normal sized (#18963) 2022-09-07 13:39:11 +01:00
KugamoGitHubFarie82SteelSlayer
 		38f335e8b9 Big Fat Emission PR (#18124) 
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* Part 1

* rest of the airlocks

holy shit that took a long time

* part 2

* part 3

finale

* conflict resolution

* fixes warnings

* fixes paneloen airlock emissives

* adds back changes from #18145

* #18085 sprites

* SteelSlayer Review

readded process in status_display, idk why I removed it, it broke some functionality

* future proofing firedoors

Talked with the contributor who added emissive appearances to the codebase. As of now they wont block them unless they spawn as closed, but with future PR merges this code will work.

* solar panel PR conflict resolve

* pain

* small fix

* farie82 suggestions

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* farie82 suggestions part 2

* farie82 suggestions part 3

* finalle

pog champ ers 2000

* farie82 suggestions the sequel

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* SteelSlayer Suggestions

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-23 11:31:20 -05:00
moxianGitHubFarie82
 		09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845) 
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* farie's review part 2

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-06-29 08:33:52 +02:00
moxianandGitHub 64c2bccb36 Mark ui_data procs as SHOULD_NOT_SLEEP(TRUE) (#17847) 
* mark ui_data procs as SHOULD_NOT_SLEEP(TRUE)

* Address dm warnings
 2022-05-24 12:47:19 +01:00
Fox McCloudandGitHub 55a6c23bc7 Removes civilian: Return of the Assistant King (#17103) 
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
 2021-11-16 19:49:08 +01:00
Dragonkiller93GitHubAffectedArc07Farie82
 		0690c3dddd EFTPOS code parcel now spawns in the chef's backpack. (#16034) 
* EFTPOS now spawns on the ground under the chef.

* Now spawns in the chef's backpack, thanks AA.

* Update code/modules/economy/EFTPOS.dm

Unneeded identifier.

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Now drops on floor if there is no backpack.

* Update code/modules/economy/EFTPOS.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-06-29 11:50:06 +01:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
SabreMLandGitHub ab73707d07 Finite money (#16044) 2021-05-18 09:59:26 +01:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07 62b618dcd4 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2021-01-28 21:35:44 +00:00
AffectedArc07andGitHub a4bb84fc6d SSticker minor refactor (#15089) 
* SSticker minor refactor

* Even the experienced make mistakes

* tiny lil bandaid

* Oops

* Update code/controllers/subsystem/ticker.dm

* Adds this
 2020-12-16 14:05:10 -05:00
AffectedArc07andGitHub 44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
SabreMLandGitHub c1fc688d08 Makes ATMs put money into your hands when withdrawing (#14961) 
* Update ATM.dm

* Makes the description more explanatory

A bit out of scope of the PR but eh

* Bugfix and tweaks

* Whoops

Left some tests in the last commit
 2020-11-25 23:53:21 -05:00
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07 984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
variableundefined 7d447973dd Remove redundant return 2020-11-01 12:25:50 -05:00
variableundefined 6076670720 Address Mochi Concerns 2020-11-01 11:12:56 -05:00
variableundefined 96e1413d3d Address Affected Concern remove redundant imports 2020-10-31 18:16:10 -04:00
variableundefined 451c9fdd1d Finish up the introduction and login interface, changes all pin to proper six digits. WIP stubs for other screens. 2020-10-30 17:23:36 -04:00
variableundefined a9923f04f2 Finish backend changes, probably 2020-10-25 17:02:34 -04:00
variableundefined bf956c4a99 Initial Incomplete Commit 2020-10-24 14:02:30 -04:00
AffectedArc07andGitHub 1dfd637c80 [TGUI] Accounts Uplink Terminal (#14697) 
* TGUI Accounts Uplink Terminal

* Mochi tweaks
 2020-10-22 17:16:11 -04:00
AffectedArc07andGitHub 2c999ccef1 TGUI EFTPOS (#14683) 2020-10-21 09:36:53 -04:00
AffectedArc07andGitHub f40a8163ff Codebase Cleanup - 2020-09-27 (#14472) 
* Codebase Cleanup - 2020-09-27

* Endings

* Forgot meta

* Farie Tweaks
 2020-10-15 13:22:52 -04:00
mochi 444a7bfe92 Address AA 2020-10-04 20:54:47 +02:00
mochi c2f494cdaa [TGUI] Newscasters 2020-10-03 23:55:58 +02:00
AffectedArc07 8aad5f7c98 Yes, I got shot by my own CI 2020-07-13 10:17:17 +01:00
AffectedArc07 38e4876453 Removes the last of the red cross 2020-07-13 10:08:03 +01:00
Fox McCloudandGitHub b3d69aac9b Moves to BYOND 513 (#13650) 
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
 2020-06-26 01:15:59 -06:00
Fox McCloudandGitHub c8a7607129 Purges a Bunch of In World Calls (#13641) 
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
 2020-06-22 06:56:19 -06:00
AffectedArc07andGitHub 928a8f0e04 Makes the code pass dreamchecker (#13161) 
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
 2020-04-11 15:59:16 -06:00
Mitchs98andGitHub 221a06e891 Increases ATM Withdrawl Limit (#13214) 
* LETITRAIN

* derp
 2020-04-10 21:46:10 -06:00