McRamon
fce54deb01
Pimp my drip ( #21527 )
...
* first changes, lest see bugs
* fix
* minor sprite fixes
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* update
* mhm
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-07-31 19:12:26 +01:00
Octus
8ce541adb1
Update pack_security.dm ( #21477 )
2023-07-01 10:46:19 +02:00
DGamerL
e2bb3cee01
You can now order gas canisters from cargo ( #21400 )
...
* canister restocks
* adds Destroy()
* sirryan suggestions
* Sean review
2023-06-28 14:56:41 +01:00
Contrabang
032e1c1501
foodcrate ( #21207 )
2023-06-14 21:17:14 +01:00
Bjamcham
a3355c5fd0
Solars Price Reduction ( #21230 )
2023-06-14 21:11:34 +01:00
Christasmurf
81024f910e
Adds JaniDrobe, LawDrobe (No Mapping) ( #21141 )
...
* drobes and shit
* Update code/game/machinery/vendors/wardrobe_vendors.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* janidrobe sprite change
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-06-02 19:03:49 +01:00
Henri215
f2ef07239f
Updates piano path ( #20839 )
...
* Updates piano path
* ops
2023-06-02 17:34:10 +01:00
S34N
bdb8039c8f
Adds gorillas and cargorillas ( #20830 )
...
* goril
* goril2
* arms
* goril3
* goril4
* rampaging
* emote
* trait
* more gorilla
* ooga
* Magillitis Serum Autoinjector, crates
* return to monke
* remove unused trait
* oops
* sirryan
* earth
* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* fixes and stuff
* gorilla text clarification
* tweak probs, stop if dead
* volume
* gorilla sleeping attack
* Apply suggestions from code review
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
2023-06-01 18:36:07 -05:00
Ryan
11717823df
Power Code Cleanup + Conversion to Regional Powernets [Refactor Only] ( #20598 )
...
* initial edits
* more cleanup, yipee
* moving shit around
* dme fixes
* fixes file ticking issue
* more dme fixes + duplicate files???
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* glass floor fixes
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* requested reviews
* the most painful bugfix of my life
* forgot to remove some debug stuff
* fixed issues with excess power
* fuck powernets (fix)
* Update code/modules/power/powernets/README.md
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2023-05-31 20:55:10 -05:00
Samman166
49b26c4eba
WT Rework and Nerf ( #20536 )
...
* Reworks and nerfs WTs
* Removes some duplicate comments
* Makes WT ammo box's normal sized items because I forgot to at first
* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once
* Sanity checks work properly now
* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Magazines fit in security webbings
* I forgot a comma
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Applies various suggestions
* removes moving_do_after now that its a param
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* solves the merge conflict hopefully
* step one of trying to fix conflict again
* step two hopefully fixes conflict
* Delete ammo.dmi
* Merge branch 'master' into wt-rework
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Revert "Applying various reviewer suggestions"
This reverts commit 7081e9aa2b96dab4f8b86906a6765477684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2023-05-25 18:41:56 +02:00
HMBGERDO
3931617e67
SWAT suit tweak ( #21049 )
...
* removed SWAT suit spaceproof, removed SWAT suit slowdown, added BLOCKHAIR to SWAT helmet
* Update code/modules/clothing/suits/armor.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/suits/armor.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2023-05-22 22:06:13 +02:00
Ryan
7d72183077
fix ( #20882 )
2023-04-22 09:45:21 +02:00
Henri215
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
1080pCat
deef459069
Freshens up floodlights to not be 10 years old ( #20727 )
...
* Flood lights!
* gramma! my enemy!! (and a forgotten span)
* gramma AGAIN!
* more spans
* runtime issue, wording, and simpler crowbar
* changes a 1, to a TRUE
2023-04-22 09:17:35 +02:00
Burzah
7503a6c187
proc adjustment ( #20678 )
2023-03-26 11:49:15 +01:00
Coolrune206
d559f2ce89
Adds the Security Laser Rifle ( #20602 )
...
* security laser rifle
* RnD magazines, yum
* "Hey Drake, where's the req_tech?"
* increases ammo count to 20. flattens magazines.
* RIP small magazines
* fixes it being unprintable, oopsies
* caseless laser rounds
2023-03-26 11:43:19 +01:00
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
