PopeDaveThe3th and GitHub
58c7fa9a0d
Fairly Sizable Fed Lore Drop ( #26600 )
...
* the fedening
* Federation -> TSF
* Update outfit_admin.dm
* Update outfit_admin.dm
* i forgor
* few more
2024-09-03 13:04:56 +00:00
f6b8d87e78
Adds sscooters and skateboards [serious pr do not close after AFD] ( #24934 )
...
* WORLD WIDE NOISE
* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding
* grind on pipes
* https://youtu.be/cTiM1MJ1o7c?feature=shared
* https://youtu.be/Jc6CHI9f6cM?feature=shared
* temporary change for icon conflicts (hopefully)
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* The rest of the fun loving owl
* missed this one
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* changes
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* I love stealth conflicts!
* purge lines
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update tg_vehicles.dm
* works works works
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-25 21:38:40 +00:00
69f20e250b
Removes Nanomob ( #25417 )
...
* Nukes nanomob
* Forgot this
* Update code/modules/client/preference/loadout/loadout_general.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
2024-05-14 09:29:38 +00:00
Probablyjay19 and GitHub
a45fc0bbdb
Removes toddler dolls because it's just a bad idea ( #25288 )
...
* Removes toddlers because it's just a bad idea
* puts some text back that wasn't actually for toddlers
* removed the baby
2024-05-07 02:34:40 +00:00
a5783c7169
Adds new microtransaction method: Scratch Cards! ( #22618 )
...
* scratch cards!
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* tweaking values
* maint loot tweak and to_chat
* sprites
* DGamerL review
* adjusting volume
* better like this
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-10-09 20:36:24 +01:00
67901058ae
Unum! The card game. ( #22152 )
...
* UNUM!
* distributing unum
* merch vendor
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* color
* dmi update
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-09-01 23:18:37 +01:00
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
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
