cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
501 Commits
Author SHA1 Message Date
ChapGitHubAdrer
 		c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881) 
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-16 17:46:19 +00:00
AdrerGitHubLucDGamerLadrermail@gmail.com <adrermail@gmail.com>
 		a8668cce00 [FIX] Dead cats no longer chase mice (#26826) 
* Dead cats no longer follow mice

* Also stop chasing if the mouse is already dead

* No reason for these to not just be walk

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-19 13:17:23 +00:00
1080pCatGitHubDGamerL
 		b87120e548 Syndicake factory has power again. And the commando wont go crazy on its pet bunny. (#26554) 
* syndicake factory has power again

* Update code/modules/mob/living/simple_animal/friendly/bunny.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-22 10:55:20 +00:00
DGamerLandGitHub 69a0848b0e Stops mice from eating cables during CI (#26496) 
* Stops mice from eating cables during CI

* WE TEST CI WITH THIS ONE

* Revert "WE TEST CI WITH THIS ONE"

This reverts commit e163eaf612.

* Comment

* Charlie review
 2024-08-17 23:31:13 +00:00
BurzahandGitHub c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Spaghetti-bitGitHubContrabang
 		6837ea7333 Caterpillars and Nymphs that evolve no longer provide blood to vampires and cannot be culted (#26174) 
* Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires.

* Improves comments and changes the trait name.

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-03 00:07:33 +00:00
DGamerLandGitHub 098b13bb33 Removes the empty type of /snacks (#26010) 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-29 14:46:04 +00:00
DGamerLandGitHub 4a84520147 Replaces a weird loop with the spin() proc (#26182) 
* Wacky things

* Whoopsie
 2024-07-12 16:54:13 +00:00
DGamerLandGitHub 4cf6595d12 Makes all playsounds use bools for vary (#26183) 
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
 2024-07-08 23:54:38 +00:00
DGamerLGitHubCharlie
 		5e7b0c0971 Changes even more uses of stat comparisons to use the defines (#26154) 
* First wave

* Second wave

* Last wave

* Apply suggestions from code review

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* We love signals in this household

* Revert "We love signals in this household"

This reverts commit 75fe8d46a3.

* Update code/game/machinery/camera/tracking.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/machinery/camera/tracking.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-07 22:57:01 +00:00
KyaniGitHubRyanMattDGamerLCharlie
 		04949b4a5e Newspaper bap fix (#26112) 
* ddsadsa

ddsadsa

* Update pet.dm

* Update pet.dm

* Update code/modules/mob/living/simple_animal/friendly/pet.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* early returns

* early returns

* Update code/modules/mob/living/simple_animal/friendly/pet.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/pet.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/pet.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
 2024-07-06 21:29:06 +00:00
QwertytofortyGitHubCRUNCH
 		9dcf6ee91c Fixes easy slaved non golems. Fixes syndicate MMI abuse (#26020) 
* Fixes easy slaved non golems. Fixes syndicate MMI abuse

* Update code/modules/surgery/robotics.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-07-03 03:44:15 +00:00
GaxeerandGitHub 32e46c02aa refactor: rename action button appearance related variables and procs to be clearer (#25658) 
* refactor: make action appearance creation more straightforward

* some adjustments

* fix: adjust action icons to refactor
 2024-07-01 02:29:31 +00:00
Spaghetti-bitandGitHub a7d1610255 [HOTFIX] Nianworme inhand / UI sprite fix (#26009) 
* Should fix the missing hand sprite for caterpillars.

* Adjusts a comment.
 2024-06-22 22:43:09 +00:00
Spaghetti-bitGitHubLucDGamerL
 		f0cef57c17 Nian Caterpillar Infestation and Worme Invasion (#25560) 
* I hate DMI merge conflicts.

* Attempt at full merge conflict resolution

* Ticked >:C

* Moves the include because

* Fixes missing proc.

* 🫃

* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.

* Adds changes requested by DGamerL

* Replaces space indents with tabs. Error caused by copy pasting.

* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Uniforms the tab spacing.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Adds requested changes from @lewcc

* Removes so missed #undef in `monkey.dm`

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-22 18:20:27 +00:00
warriorstar-orionandGitHub a58d766f72 cleanup hardsuit-related code (#25746) 
* cleanup hardsuit-related code

* kill sprite too
 2024-06-12 18:05:15 +00:00
DGamerLGitHubBurzah
 		de6a54fbde Removes all mentions of return . where they would be unnecessary (#25142) 
* Removes all mentions of `return .`

* I can do this all day

* Arthri review

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-04-23 00:49:52 +00:00
tristan1333GitHubHenri215DGamerL
 		ebbbf62cec Chicken meat/burger, Onigiri, Seaweed, updated boiled rice sprite (#24813) 
* Adds chicken meat, burger, onigiri, updates boiled rice sprite

* Update code/modules/food_and_drinks/food/foods/side_dishes.dm

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

* Update code/game/objects/items/stacks/seaweed.dm

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

* changed chickenburger pathname, deleted old boiled rice sprite

* Transfers reagents from rice to onigiri

* Update code/modules/research/designs/biogenerator_designs.dm

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

* All sushi now requires seaweed

* new seaweed desc, attackverb oopsy daisy, seaweed attack_self doesn't show pointless list, Onigiri goes in hand

* moved seaweed sprite to organic.dmi

* Update code/modules/research/designs/biogenerator_designs.dm

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

* Update organic.dmi

* re

* goal

* oops

* early return

* Update code/modules/food_and_drinks/food/foods/side_dishes.dm

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

* Update code/modules/food_and_drinks/food/foods/side_dishes.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/side_dishes.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/side_dishes.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-04-21 23:06:47 +00:00
GDNandGitHub 9e6dcf9c46 removes the remaining datum redeclares (#25220) 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
 2024-04-21 18:26:35 +00:00
DGamerLGitHubDenizFunnyMan3595
 		bad8b31afa Changes all .len to length() where applicable (#25174) 
* Globals work

* Double access works

* All other things

* Revert "All other things"

This reverts commit 6574442eb6.

* More changes that compile and work

* IT WORKS AAAAAA

* Changes even more .len to length()

* Apply suggestions from code review

* Update code/datums/mind.dm

* Update code/__HELPERS/sorts/InsertSort.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-04-19 17:32:09 +00:00
AylongandGitHub 6fe23a6a20 Another bunch of fixes for TGUI inputs (I'll be cursed...) (#25009) 
* Oh god, oh fuck, WHY DIDN'T I USE isnull()???

* More correct checks

* That's all

* That's all x2

* Flavor fix
 2024-04-12 18:51:36 +00:00
Code-Lyoko0andGitHub 555cd34868 bunny can now ventcrawl (#25005) 2024-04-12 18:39:36 +00:00
ContrabangandGitHub 744d9c6bed Ports and Adapts TGUI strip panel from TG (#24618) 
* part 1

* these also

* fuckin nuke it

* more

* more stuff

* more crap

* wow

* holy fucking shit, it works

* thats a start

* oops

* fubing bundle

* hahah brrrrr

* I LITERALLY ADDED IT BACK, FUCK OFF GIT

* yeah more changes

* hide abstract

* blamo

* thats enough for today

* old code begone

* goodbye can_strip

* nearly there

* finally

* fuckin finally

* review

* tgui

* unbreak shit

* fix OD

* okay, that should fix the last thing

* remove hover on nodrop, fix early interacting
 2024-04-08 21:40:11 +00:00
Charlie NolanGitHubBurzah
 		6c4a80d2e5 Corrected a bunch of over-escaping. (#24876) 
* Corrected a bunch of over-escaping.

* unundefine

* Fixed #23759

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Review fix

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-04-07 10:59:15 +01:00
Charlie NolanandGitHub 529c602ac6 What have I done? (#24897) 2024-04-03 14:28:00 +00:00
LucandGitHub 1fe7819c1b Ports action button refactor from /tg/ (#24482) 
* add the new stuff

* guh

* add the brunt of it

* action button stuff

* adds a lot of other stuff

* careful find and replace

* it loads

* so many huds

* ehh yeah this kinda works

* fixes this runtime

* hacks in some DMI stuff, we'll fix it later

* Adds better mouse pointer for dragging buttons

* gets dragging into place working again, updates DMI

* moves define

* remove extra hud defines, now it compiles

* CHECK GREP

* owww

* rename action defines

* ticks

* are we good

* let's try that again

* renames mob vars

* renames

* fixes some hud issues with huds getting the wrong variable

* fixes some alignment issues

* Adds mouse-wheel scroll support

* left -> right

* I am the entire circus

* first self-review pass

* Another review pass -- just realized I need to fix keybinds

* more testing

* update icons

* oops

* Fix spell icons not appearing properly

* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons

* hmm

* weh

* again?

* nah?

* maybe this?

* asdf

* should finally fix CI

* add client check

* move the ?

* add missing override causing runtimes

* shift-clicking now doesn't trigger the button

* better docs
 2024-03-24 17:38:53 +00:00
QwertytofortyGitHubHenri215
 		9096c5f0b9 Ports the NTSS Raven from TG station. Slightly remaps delta escape / faragus escape (#24567) 
* R A V E N

* docking ports. Delta needs  tweak

* yep

* raven generators, increased range / anchored

* names / fixes wrong generators

* decore / missing decal

* NTSSS RAVEN

* purge this

* oops

* should be good

* Update code/modules/mob/living/simple_animal/friendly/mouse.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>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-21 21:21:56 +00:00
Pierre-LouisGitHubContrabangPierre-Louis
 		979b3c52cf Collar on a chick stay when it grow into a chicken. (#24524) 
* Collar on a chick stay when it grow into a chicken.

Collar on a chick stay when it grow into a chicken.
Fixes #24412

* Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm

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

---------

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-19 17:08:09 +00:00
Charlie NolanGitHubHenri215
 		4dcc43fc88 Made eating Keeki a bit smarter. (#24373) 
* Made eating Keeki a bit smarter.

* Prions -> Teslium, minor fixes.

* Better comment for total_final_bites.

* Apply suggestions from code review

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

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-18 18:34:58 +00:00
ContrabangandGitHub 664b04a1cb goodbye exclaims (#24593) 2024-03-18 18:04:14 +00:00
ContrabangandGitHub e32544e599 #undef is now required for all file defines (#24091) 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
 2024-03-11 14:03:30 -04:00
GDNandGitHub 6b5de292dc Removes datum redeclares (#23950) 
* Removes datum redeclares

* conflicts

* thanks vsc

* compile fix
 2024-03-10 17:55:29 +00:00
YoursTrulyHollowGitHubContrabang
 		e43fb1ce34 fixes the error where chicks lose their custom name when growing into chickens (#24409) 
* fixes chicks

* Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm

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

* Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-06 13:22:35 +00:00
Charlie NolanandGitHub 7ae3bf6747 Stop using \improper improperly. (#24410) 2024-03-03 18:04:52 +00:00
ContrabangGitHubBurzah
 		87a318a7de Refactors screen objects to /atom/movable (#24068) 
* introduce helper + remove unused proc

* we love compatibility

* Update code/_onclick/hud/action_button.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/action_button.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/blob_overmind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/martial_arts/martial.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/shadow.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/shadow.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/living_update_status.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/internal.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/camera_advanced.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/camera_advanced.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/internal.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/mecha/mecha.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* deconflict

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-03-03 17:37:51 +00:00
warriorstar-orionGitHubLucS34N
 		0667f20681 move all EOL comments on typepath names to dmdoc (#23928) 
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 20:05:49 +00:00
Charlie NolanandGitHub 19cdfcdbef Set the kitten's resting sprite properly. (#24326) 2024-02-27 17:25:24 -05:00
AylongGitHubAylongS34N
 		ac5add482f [READY] TGUI Input Collection (#23891) 
* List Input refresh

* Modal Alerts

* Text Input

* Number Input

* Split Button

* Renaming

* Alert converts

* Text Input Conversion (Part 1)

And TextArea Autofocus + maxLength

* Text Input Conversion (Part 2)

* AAAAAAAAAAAAAAAAAAAA

* I'm FUCKED

* @GDNgit review changes

* "&#39;" fixes

* Revert TGUI Alert from admin delete

* NumberInput Window size

* CRASH if empty list

* Update code/modules/tgui/tgui_input/list_input.dm

* TGUI Rebuild

* TGUI Rebuild

* Update code/modules/paperwork/faxmachine.dm

* _char

* compile

* Rebuild

---------

Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-19 11:55:01 +00:00
GDNandGitHub 82b863cefd Converts over the missing TGUI input lists (#23859) 
* Converts over the missing TGUI input lists

* last fixes

* num revert
 2024-02-14 21:17:29 +00:00
QwertytofortyGitHubHenri215BurzahDGamerLLuc
 		c398e4a617 Adds 2 cybernetic implants, makes emag_act return TRUE (#23876) 
* Adds 2 cybernetic implants, makes emag_act return TRUE

* the rest of the fucking owl

* yeah that would do it

* remove this

* Apply suggestions from code review

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

* request changes, scaling burn damage, 3 tile range, lowers tech level

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/crates.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update scanners.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

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

* Lewcs good to them?

* Apply suggestions from code review

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

* fuck me

* there are no message admins in ba-sing

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-08 12:52:11 +00:00
DGamerLGitHubRyanHenri215
 		db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
QwertytofortyGitHubLucContrabangHenri215RyanGaxeerSteelSlayer
 		d668a29a60 Ports (most(ok like half)) station traits from tg. Ready for review into TM (#22334) 
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life

* some changes /fixes

* Apply suggestions from code review

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

* more changes

* oh right, the murders (uplink price tweaks)

* Update code/controllers/subsystem/SSjobs.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>

* compiles

* doesnt work but works better

* tgui dogs still sleep but I want to sleep

* it should finally compile now. Probably.

* Update tgui.bundle.js

* Sorry IAN, transfer components is shoddy as hell

* removes minor uneeded /tgui

* also extra line whoops

* final stuff

* reverting changes I made earlier is hard ok

* Weight change, uplink reference

* oh right, the hey fucko

* Update code/_globalvars/traits.dm

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

* Update tgui.bundle.js

* pushes

* pulls it

* Apply suggestions from code review

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

* more changes, ion rifle blocked on cyb revolution

* dipshit remove the debug / tgui pritier and such

* tgui

* updates tgui again as nanomap was merged

* Apply suggestions from code review

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

* comment / tgui

* every day I worry all day

* Full TGUI rebuild + prettier

* ah fuck

* leave a customer feedback at the link below!

* tgui momenr

* tgui moment

* FUCK I am dumb

* vertical TGUI

* She T's on my GUI till I

* Update tgui.bundle.js

* Apply suggestions from code review

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* Update code/modules/supply/supply_pack.dm

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* IPC can now use robotic hearts / pulse demon hearts and charge

* fixes revert not working for hangover / arrivals

* tgui moment

* hhgreg

* fixes that one bug

* Every day I worry all day

* deconflicted for real this t ime

* Update code/datums/station_traits/postive_traits.dm

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

* ch-ch-ch-changes

* Update SSjobs.dm

* Update code/modules/supply/supply_pack.dm

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

* deconflicted but won't pass CI

* fixes double dipping on traits

* my le consoles, they le no work?

* Great Great Asset, Asset, Great Great Asset, Asset...

* sorry slime mains

* fixes borgs being punished heavier

* actually fixes it, I was dense

* hopefully fixes borg drunk further

* makes it compile?

* actually makes it compile god whyyyy

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
 2024-01-08 19:07:09 +00:00
ContrabangandGitHub 87d8da7b1e Code improvement for ventcrawling defines (#23514) 
* code improvement

* oops

* bad comment gone
 2023-12-16 16:13:58 +00:00
JimKil3andGitHub f718c985e4 oops (#23291) 2023-12-06 15:31:49 +00:00
LucGitHubDGamerL
 		2d6545a291 Runechats emotes with sound effects. (#23255) 
* Remove emote_sound from the codebase

* quick cleanups

* Update code/datums/emote.dm

oops

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* gnarg

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-11-29 18:18:20 +00:00
1080pCatGitHubDGamerL
 		e2ffb8a882 Engineering borg nerf (just their decompiler ;p) (#23227) 
* Engi borg nerf

* Update code/game/objects/items/devices/flashlight.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/lizard.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/chemical_bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update lighters.dm

* Update spiders.dm

* reverts some that maybe should stay

* oops

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-11-14 12:51:13 +00:00
ContrabangGitHubHenri215
 		48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777) 
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-12 20:59:43 +00:00
JimKil3andGitHub a5812e0245 Dionae can now drop nymphs they've picked up (#23020) 
* the feature

* sirryan review

* oopsies
(adds an #undef)
 2023-10-31 18:36:53 +00:00
Ninetoes3GitHubContrabang
 		e5b668a1d1 Return of Var on Cyberiad (#22674) 
* Update cat.dm

* forsaken cat change

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

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

* Update feral_cat.dm

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-31 15:48:20 +00:00
SadhorizonGitHubS34NHenri215
 		d3ea6b2620 Remaps the Lavaland Outpost. Again. (#22391) 
* a remap begins...

* tweaks

* bye-bye, QM's handheld crew monitor

* brings back the abandoned crate

* oop

* more tweaks

* tcomm pipes

* brad update

* more firelocks

* more windows

* tweaks

* denth review part 1

* renaming doors

* crowbars

* changes walls, new locker

* Oyu's review

* more tweaks

* signs

* MAYBE will be deconflicted

* now deconfllicted hopefully

* some more tweaks

* no more wall helpers!

* fluff

* IDs for polarized windows

* slight tweaks to firelocks

* added grilles

* more tweaks

* tiny lil maint update

* more maint tweaks

* maint rework part 3

* oopsie

* jani has dark floors now

* reworked robotics, gave brad more love

* stationary defibs

* stuff

* bug fix

* more tweaks

* aaaaa

* Revert "aaaaa"

This reverts commit f70ba3a89a.

* more tweaks

* fixed scrubbers, tweaks

* should compile

* reshuffles maint loot

* request consoles + tweaks

* more tweaks

* access helper tweaks

* very minor access tweaks

* you can now pet Brad

* Update code/modules/mob/living/simple_animal/friendly/cockroach.dm

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

* renames access

* shuttle decorations + other tweaks

* oopsie

* bjam's reviews

* split the QM's locker
Exa's approval, rest of design team did not share opinions

* OH UH

* this too

* this is a better way to do it actually

* sean review + floodlight subtype

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-21 21:30:28 +01:00