Commit Graph

11 Commits

Author SHA1 Message Date
Henri215
1ce593b9a2 Ports TG push broom (#20367)
* Ports TG push broom

* Update code/game/objects/items/weapons/twohanded.dm

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

* Apply suggestions from code review

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

* Lewc review and twohanded autodoc

* Steelslayer review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 12:15:21 -06:00
Contrabang
93f26cf5aa Adds a cargo crate spawning tool for admins (#20220)
* Allows admins to create cargo crates

* AA and Miravel review

* remove debug text

* AA review

* Oops

* sirryan review

* sirryan review 2

* atom to turf
2023-02-13 23:21:58 -06:00
warriorstar-orion
b790e6d5e2 Whitespace cleanup part 4. (#20226) 2023-01-20 19:40:42 -05:00
Henri215
92f681e8f2 Removes toner cartridge/water tank crates (#20108)
* Water tank crate removed

* toner cartridge crate removal
2023-01-13 16:51:43 +01:00
Ryan
d053233366 Fixes 3 Economy Bugs (#20094)
* fixes galore

* ai fix
2023-01-06 22:11:58 +01:00
Sirryan2002
7be765d5ef Cargo Techs now have the same power as the Quartermaster to approve crates at the supply console (#19793)
* change qm -> ct

* rebuild TGUI

* rebuilds TGUI

* qm -> ct

* fixes comments and other var names
2022-12-29 17:05:11 +00:00
McRamon
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
Henri215
dfb85e6460 Preparing for the summer: baseball and dodgeballs! (#19627)
* welcome to the space jam

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

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

* Update code/game/objects/items/sport.dm

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

* Apply suggestions from code review

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

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-25 22:50:17 -06:00
Henri215
baf269ac16 Supply packs tweaks (#19751)
* supply packs tweaks

* removed by mistake

* ops

* wizard costume added to costume crate

* added back beekeeper suit crate

* removed bottler crate
2022-11-25 21:11:20 +01:00
Henri215
615ae2db4e Adds wedding/costume/bloody armor crates and other tweaks (#19231)
* adds wedding/costume crate and crates tweaks

* salmon suit was a mistake

* lowered armor cost and added monkey costume

* Update code/datums/supplypacks.dm

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

* forgot to include the hood

* deconflict part 2

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-21 22:43:54 -06:00
Sirryan2002
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