tomixcomics
fec20152b8
New lore foods, Milkshakes, and a bugfix. ( #18048 )
...
* New foods, milkshakes, and a bugfix.
* changed syrup colors
* resolved weird merge conflict
* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* made requested changes
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/reagents/Chemistry-Recipes.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/cooking/recipes/cultural/recipes_human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* made requested changes
* more corrections
* updating again because it didn't take last time
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
2023-12-27 16:40:09 +00:00
DreamySkrell
fc1c2fcf5d
a ( #18054 )
...
Co-authored-by: DreamySkrell <>
2023-12-27 16:39:40 +00:00
RustingWithYou
c07340bcf5
Energy Weapon Recharging: The Future Is Now ( #17969 )
...
* charge stuff
backpack charging
adds to antag uplink & ert suits
* modules for breachers & backpacks for lizards
* Update code/modules/projectiles/guns/energy.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* requested changes
* hghghuh
* Update code/game/objects/items/recharger_backpack.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* variable tweaking
* Update code/modules/projectiles/guns/energy.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/game/objects/items/recharger_backpack.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/clothing/spacesuits/rig/modules/utility.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/clothing/spacesuits/rig/modules/utility.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/clothing/spacesuits/rig/modules/utility.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/clothing/spacesuits/rig/modules/utility.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* recharger for new suits
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
Co-authored-by: Alberyk <Alberyk@users.noreply.github.com >
2023-12-26 02:31:25 +00:00
Matt Atlas
cadd19beac
Ports the TG globals controller and converts globals. ( #18057 )
...
* SDQL2 update
* fix that verb
* cl
* fix that
* toworld
* this is pointless
* update info
* siiiiick..
* vv edit update
* fix that
* fix editing vars
* fix VV
* Port the /TG/ globals controller.
* part 1
* part 2
* oops
* part 3
* Hollow Purple
* sadas
* bsbsdb
* muda na agaki ta
* ids 1-15
* 16-31
* 41-75
* bring me back to how things used to be before i lost it all
* the strength of mayhem
* final touches
* cl
* protect some vars
* update sdql2 to use glob
* stuff?
* forgot that is not defined there
* whoops
* observ
* but it never gets better
* a
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com >
2023-12-26 01:16:02 +00:00
Fluffy
a02be9f1fd
Updated SSAtoms to TG's version ( #18032 )
...
* emperor protects
* sdfas
* sadf
* sdf
2023-12-25 20:38:08 +00:00
Fluffy
1e41b55f50
More keybindings ( #16329 )
...
* Macros+functions+changelog
* Fixed changelog mistype
* Readded the old up/down keybinds, added preference for the toggle
* Removed toggle as requested by head dev
* sf
2023-12-25 19:48:22 +00:00
Matt Atlas
12487c94bb
Updates SDQL2 to the latest TG version and adds variable protection. ( #17997 )
...
* SDQL2 update
* fix that verb
* cl
* fix that
* toworld
* this is pointless
* update info
* siiiiick..
* vv edit update
* fix that
* fix editing vars
* fix VV
* discord protection
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com >
2023-12-25 17:10:35 +00:00
Matt Atlas
4629903dd2
Adds Dominian Imperial Army gear. ( #17971 )
...
Co-authored-by: Matt Atlas <liermattia@gmail.com >
2023-12-25 16:19:40 +00:00
Fluffy
8cfed3d389
Limb nymphs fixes ( #18039 )
...
* sdf
* Update code/modules/organs/subtypes/nymph_limbs.dm
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com >
---------
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com >
2023-12-25 16:04:27 +00:00
Fluffy
5d366d827c
sfad ( #18055 )
2023-12-25 16:04:23 +00:00
Fluffy
07ec5470c0
sdfa ( #18053 )
2023-12-25 00:18:54 +00:00
Fluffy
d2179ffb2b
Fix runtime qdeleted organs ( #18013 )
...
* Atomization
* sd
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-24 23:42:46 +00:00
Geeves
e9611d038c
Psi Grip Tweak ( #18027 )
...
* Psi Grip Tweak
* matt request
* Apply suggestions from code review
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
2023-12-24 23:33:38 +00:00
RustingWithYou
8e6b4cc633
More Ninja Hardsuits & Gear Crates ( #18020 )
...
* ninja hardsuits
but here's the warbler
balance tweaks to bug armor
yeah??? fucker.
we're so back we're so back we're so
and icons
changelog and syntax fixes
guh
* oops
* rig nerf
2023-12-24 23:31:31 +00:00
naut
f778ee5232
CCIA HRA makeover ( #18029 )
...
* fixes
* Auto equips holster + fixes suit open state
* aviator sunglasses
2023-12-24 23:28:25 +00:00
Fluffy
d008439ab7
sadf ( #18051 )
2023-12-24 23:27:04 +00:00
Fluffy
a69992c2f2
sadf ( #18050 )
2023-12-24 22:07:10 +00:00
RustingWithYou
f99204a3b7
ert extravaganza ( #18022 )
2023-12-24 11:18:43 +00:00
Fluffy
51a96cb43e
sfad ( #18021 )
2023-12-24 11:18:41 +00:00
Alberyk
0b8ec5726a
Adhomian typewriter and camera ( #17999 )
...
* things
* paper
* oh the misery
* fixes
* stuff
* aaa
* Fixes
* more fixes
* more fixes
* final fixes i hope
* Fixes
* destroy fix
* more destroy
* white space
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
* Update code/modules/paperwork/typewriter.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
2023-12-24 03:36:05 +00:00
Geeves
25adf63bc7
Courier Expansion ( #18002 )
2023-12-24 02:20:34 +00:00
Geeves
bc1887a728
Ghost Spawner Manifest ( #18001 )
2023-12-24 02:20:27 +00:00
Geeves
ad73ccc3f2
PDA/Wristbound On-Mob Sprite Removal ( #17988 )
2023-12-24 02:20:11 +00:00
Geeves
69bbef61cf
Mirror Shade Fix ( #18044 )
2023-12-22 21:25:21 +00:00
Geeves
8cc5041923
Exosuit Turn Fix ( #17991 )
...
* Exosuit Turn Fix
* Update code/modules/heavy_vehicle/mech_interaction.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
2023-12-22 21:18:25 +00:00
Cody Brittain
40e5d511d5
Improve cryo tubes ( #17919 )
...
* Improve cryo tubes
* JS --> TSX
* Fix lack of type
* Cryo tube improvements
* Update code/game/machinery/cryo.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
---------
Co-authored-by: Cody Brittain <cbrittain10@live.com >
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com >
2023-12-22 20:03:41 +00:00
Fluffy
a5f6143c37
Refdrop chemholder ( #18012 )
...
* Atomization
* sfd
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-22 01:19:36 +00:00
Fluffy
3500e9a43a
Carbon/human organs qdel ( #18018 )
...
* Atomization
* sdf
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-22 01:19:12 +00:00
Fluffy
b2a1946de0
Refdrop tendons ( #18016 )
...
* Atomization
* sfdas
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-21 13:50:35 +00:00
Cody Brittain
9b529f250f
Allow Eridani dregs to choose Eridani citizenship ( #17931 )
...
Co-authored-by: Cody Brittain <cbrittain10@live.com >
2023-12-21 12:21:57 +00:00
RustingWithYou
156c26b3b0
TCAF Voidsuit & Redsnout Hardsuit ( #17953 )
...
* redsnout & tcaf suits
* the suiting, auto-adapt version
* fun lil tweaks
* cl
* oops
* offline slowdown
2023-12-21 12:21:52 +00:00
tomixcomics
90f3ae6ea0
fixes some broken drink and food sprites ( #18000 )
...
* fixed broken sprites
* added changelog
* updated changelog
2023-12-21 12:21:27 +00:00
meep109
11cd1acf99
Fixes guami bugging out ( #18024 )
...
* fix guami
* Create meep109-fixguami.yml
2023-12-21 12:14:27 +00:00
Fluffy
a535b49ea5
Refdrop dmdoc external organs ( #18015 )
...
* Atomization
* sdfa
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-21 11:46:01 +00:00
Fluffy
bf5d5f9054
Prevent icon reprocessing on deleted mob ( #18014 )
...
* Atomization
* sdsa
---------
Co-authored-by: FluffyGhost <FluffyGhost>
2023-12-21 11:45:39 +00:00
Geeves
346a721753
Cult Rune Scribing Tweaks ( #17980 )
...
* Cult Rune Scribing Tweaks
* agony
* Update code/game/gamemodes/cult/items/tome.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
---------
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
2023-12-21 11:40:51 +00:00
Matt Atlas
23c0fd7b4f
Autolathe and wires panel TGUI, autolathe queueing. ( #17978 )
...
* autolathe 1
* FUCK MY LIFE
* more fixes
* autolathe queueing
* cl
* garbage collection
* wire fixes
* some final tweaks
* on second thought this might be annoying
* fix that
* whoopsies
* that didn't work for shit
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com >
2023-12-21 11:40:49 +00:00
Geeves
e68ebfe192
Fireman Stair Fixes ( #17974 )
...
* Fireman Stair Fixes
* updated cl
2023-12-20 13:19:58 +00:00
Werner
3daec39efa
Changes the discord bot into a subsystem and adds quite a bit of additional logging ( #17996 )
...
* Changes the discord bot into a subsystem and adds quite a bit of additional logging
* Removes a forgotten todo
* replaces call with RUSTG_CALL (to make it compile) and adds a comment
* Re-Add log prefix
---------
Co-authored-by: Werner <Arrow768@users.noreply.github.com >
2023-12-19 22:54:57 +00:00
feartheblackout
648230210f
Adds role restrictions to off-worlder starshades ( #17992 )
2023-12-19 19:35:11 +00:00
Geeves
eab3560d57
PDA Arcade Enemy Name Fix ( #17990 )
2023-12-19 13:38:06 +00:00
tomixcomics
c234a555fd
NTella food, drinks, and crepes ( #17948 )
...
* Notella food, drinks, and crepes
Added some foods and drinks using notella. Made several different kinds of crepes.
* added changelog
changelog wooo
* fixed merge conflicts
* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/confections.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/reagents/reagent_containers/food/snacks/pastries.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* changed all the notella names to NTella
---------
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
2023-12-19 11:46:06 +00:00
Geeves
d7db1f6d4a
Orion Express Courier System ( #17952 )
...
* Orion Express Courier System
* tweaks and fixes
* whoops this goes in the back
* cement das conk creet baybee
* while funny, fixed supplies count
* add support for non-overmap tests
* guh
* anotha one
* feedback
* remove unused imports
2023-12-19 11:45:39 +00:00
RustingWithYou
6f9140382f
Exoplanet Random Plants ( #17967 )
...
* icons
* and now, we suffer
* i keep screaming but god wont answer
* adapt seed
* Update code/modules/hydroponics/trays/tray_update_icons.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/hydroponics/trays/tray_update_icons.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/hydroponics/trays/tray_update_icons.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* Update code/modules/hydroponics/trays/tray_update_icons.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
* addresses requested changes
---------
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it >
2023-12-19 11:45:10 +00:00
DreamySkrell
ae3bf5f331
SCC Scout Ship ( #17826 )
...
* scout ship stuff
* stuff
* work
* xyz
* all roles
* things
* mappin
* things
* Revert "things"
This reverts commit ca4006f1c8
2023-12-18 12:27:09 +00:00
RustingWithYou
bc66a212d7
Hephaestus Security Ship & Corporate Voidsuit Tweaks ( #17962 )
...
* hephaestus security ship
* fuck off
* welcome mesgaes
* lattice hell
* damn you kaizr
* cabinet
2023-12-18 11:36:32 +00:00
Matt Atlas
a7a32a4954
Fixes objects held in the inactive hand not applying slowdown. ( #17977 )
...
Co-authored-by: Matt Atlas <liermattia@gmail.com >
2023-12-17 21:44:53 +00:00
Sparky
1fdf2c750c
Hammertail Gear ( #17960 )
...
* Hammertail Gear
Adds a Hammertail Smiths jumsuit, as well as adding themed gear crates to the uplink.
* Fix?
* Fix again
* Forgot to rename uplink
* Missing space
* Group Gear Looped
As requested
2023-12-17 21:44:52 +00:00
RustingWithYou
cec7b88ffc
tcfl -> tcaf ( #17957 )
2023-12-17 15:25:23 +00:00
RustingWithYou
686cec2505
Konyang Pirate Fixes ( #17963 )
...
* yeah
* byeah, even
2023-12-16 12:39:27 +00:00
