Commit Graph

934 Commits

Author SHA1 Message Date
Katherine Kiefer
d68c6455f7 Merge remote-tracking branch 'origin/master' into luciee 2022-03-31 10:48:29 +11:00
Theos
6a7f4f6be5 Adds a "structures" crafting category and moves all the structure related stuff out of misc/tribal plus reorganizing (#13488)
* someone fucking broke tails again thanks guys

* adds the "structures" crafting category and puts all the shit that belongs in it into it

* on jod ???
2022-03-25 02:31:59 -05:00
Lucy
3d4f24603d Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos 2022-02-15 19:48:11 -05:00
nmajask
61b38ac4d6 Medbay noises (#13218)
* Adds more medbay and scanner  noises

Its cool I guess

* How did I mess this up?

*sigh
2022-02-10 18:06:24 +00:00
Lucy
a50cbe7281 auxtools and katmos! 2021-12-17 17:59:11 -05:00
applepineapplepizza
f08a47457d remove vitamins again & add aiuri to aloe (#12692) 2021-11-29 11:19:03 -05:00
Byemoh
4d9582a285 [BUGFIX] Fixes some inconsistencies with the griddle (#12577)
* let the man grill

* remove multiplier since you get bonus stuff from upgrades anyway

* the maps

* changes things made with protein nutriment to be have protein

* rest of the maps

* fixes some bugs/inconsistencies

* bringing you up to speed with yugioh 5D

* fix name

* Update code/modules/hydroponics/grown/towercap.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/hydroponics/grown/towercap.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2021-11-01 21:19:26 +00:00
Theos
ff13436a72 Adds an ashwalker fertilizer mix and redescribes gutlunch milk and cheese to be more fitting for a bug (#12476)
* tribal nutriment reagent

* tribal nutriment effect on hydro tray

* tribal nutriment reaction also hello verified (also mix message for cellulose burning)

* gutlunch "honey"

* gutlunch cheese reworked to act like it's made by a bug

* forgot the \

* Update snacks_cheese.dm
2021-10-22 17:06:11 -04:00
Byemoh
68d2b8ed0e Fixes Novaflower and death nettles never hitting their attack proc and also nerfs death nettles (#12438)
* fixes and nerf

* theos changes
2021-10-15 10:12:03 -04:00
Byemoh
d2f17d6e44 admin logging check (#12420) 2021-10-10 14:18:27 -04:00
Redmoogle
1074be5011 Cleans up some do_after calls (#12417)
* Replaces do_after delays with defines instead of deciseconds

* Fixes Text
2021-10-09 01:18:35 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Chubbygummibear
36074662e1 rarity schmarity (#12275) 2021-09-11 13:39:41 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
alexkar598
0d1b78c0ef Dring dring, the 90s called, they want their URLs back (#12019) 2021-08-14 14:25:34 +01:00
Chubbygummibear
5b0f7732e7 Variable charge rate for Potato Batteries with Electrical Activity trait (#11990)
* Please god just let it be this easy

* it wasn't that easy
2021-08-14 13:44:04 +01:00
Cartlord
4ba1f9100d Update mushrooms.dm (#11455) 2021-05-13 14:29:24 +00:00
Theos
4ace87f926 ports white kit changes from tg (#11415)
* add basic stuff and minor tweaks

* stack healing change

* Update medical.dm

* makes things work  better

* removes unneefded modularization

* Update medical.dm

* i am going to poo my pants

* thought i fixed that

* Update medicine.dm

* im stuff

* Update medicine.dm

* pant poop

* forgot that

* Apply suggestions from code review

not my fualt mostly

Co-authored-by: Hopekz <hopekxx@gmail.com>

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

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update misc.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>
2021-05-08 15:52:52 -04:00
Theos
89433cd199 ports cobbychem or at least most of it (#11032)
* ports cobbychem need a break after this

* fix surface and add stuff to borg hypo whatever

* genius theos

* were it not for the laws of this land i would have slaughtered you

* should fix that

* Update cat2_medicines.dm

* final changes, adds lemoline and gates trekchems behind it, replaces any use of bicaridine and kelotane with their cobby equivalent and adds polypyr and galaxythistles

* icons for trumpet and thistle

* Update other_reagents.dm

* Update other_reagents.dm

* whoops

* Update flowers.dm

* Update misc.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicines.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* Update flowers.dm

* forgot this?

* remove old useless vars

* Update cat2_medicine_reagents.dm

* Update medicine.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-04-25 18:32:56 +01:00
Marmio64
92fd210fd4 THESTUFF (#10971) 2021-03-20 12:21:04 +00:00
ynot01
ad610953c1 removes unnecessary % (#11018) 2021-02-19 18:55:23 -05:00
FLME
5551fddf73 REMOVES GATFRUIT (#10964) 2021-02-13 16:20:21 +00:00
Theos
686c488c83 Bees are now friendly :) (#10962)
* NOT THE BEEEEEES

* angry bees will ignore anything except MURDER
2021-02-06 12:49:06 +00:00
ToGWtF
23e0bb070f one-line fixes because that is the best i can really do man what do you want from me (#10886)
* bugfixes

* fixes paystand deconstruction

* removes uncessesary ui update

* makes swamers shots not teleport eachother
2021-01-16 07:42:26 -05:00
Redmoogle
b81da5826d Convert from deci to seconds (#10810) 2021-01-07 13:47:55 +00:00
boodaliboo
14a7aa0ec3 adds pea wine (#10554)
* Update alcohol_reagents.dm

* Update peas.dm

* Update peas.dm

* Update alcohol_reagents.dm

* litterally just so it recompiles

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>

* Update peas.dm

* Update alcohol_reagents.dm

Co-authored-by: fluffe9911 <dablank02@hotmail.com>
Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-12-12 14:30:41 +00:00
Theos
5606271766 fixes bee balm sprites (#10465) 2020-11-22 16:35:21 +00:00
boodaliboo
1efa8c500b (port) The new buzz around the new soft drink (#10179)
* Update drinks.dm

* Update hydroponics.dm

* Update drink_reagents.dm

* Update drinks.dm

* Update cola.dm

* Add files via upload

* Update hydroponics.dm
2020-11-14 09:10:03 +00:00
Redmoogle
3d32c8ec19 BEHAVE (#10372) 2020-11-11 23:39:27 -05:00
Jamie D
98508e8302 Runechat 1.1 - TG Edition (#10318)
* RUNECHAT UPDATES

* Fixes hologram speech hopefully.

* Update ai.dm
2020-11-04 18:28:54 +00:00
Jamie D
0dd6fae119 [Port] Explosions Subsystem Test 1 (#10202)
* Explosions Subsystem Test 1

* Fucking linter

* Fucking TG Are Dents

* SCREW OFF LINTER
2020-10-28 17:54:13 +00:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
Jamie D
fb8eeb5a1f Tgui 4.0 - IN PROGRESS (#10116)
* Night 1

* Bit more

* MORE

* JS AND SHIT

* MORE

* IT COMPILES MOSTLY

* More and prepare for tgchat

* Woah there captain, TGUI 4.1 first.

* Shoo

* Copyshites

* Hmm

* Hmm

* Fixxxxx

* Fucking Apcs

* Fuck off autoupdate

* Rename DropDown.js to Dropdown.js

* Vending

* Few Fixes

* More Fixes

* Stand HO

* fixes sleepers without breaking anything else I think

* Oops

* Fixerinos

* Oopsie

* BUNDLE

Co-authored-by: Theos <theubernyan@gmail.com>
2020-10-25 18:34:06 +00:00
Jamie D
a8e66d657b Fucking Bood (#10144)
* Fucking Bood

* Revert "Fucking Bood"

This reverts commit 8c473d68fe.

* REEE
2020-10-24 21:32:56 +01:00
Marmio64
7a0a91767b cave fungus is better (#10133) 2020-10-24 12:25:17 +01:00
AdamElTablawy
7a39cbe0f5 Fixes itching powder to no longer be classified as a toxin in the game's code as to avoid throwing beakers of 100u itching powder at someone to cause immediate liver failure (#10067)
* fixes itching powder

* oops

* Update toxins.dm
2020-10-24 11:43:24 +01:00
boodaliboo
99ca654f08 (port) Finally, Peas. (#9965)
* Create peas.dm

* Update peas.dm

* Update megaseed.dm

* Add files via upload

* Update yogstation.dme

* Update peas.dm

* Update peas.dm
2020-10-17 12:58:12 +01:00
TheGamerdk
e73746a94a Fixes bood shitcode (#9933)
* bood code bad

* Update reagent_id_typos.dm
2020-10-10 13:02:24 +01:00
boodaliboo
5544795306 (port) Beebalm and Honeybalm (#9800)
* Update flowers.dm

* Add files via upload

* Add files via upload
2020-10-09 12:59:42 +01:00
boodaliboo
24329f936a (port) Bamboomk2 (#9723)
* Update sheet_types.dm

* Update twohanded.dm

* Update towercap.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update syringes.dm
2020-10-08 11:12:37 +01:00
yorii
606877e204 fixes rounding error in growthstages (#9879) 2020-10-07 09:33:06 +01:00
ynot01
866c2d4bfb Ghosts can now analyze plants and seeds by clicking them (#9567)
* Update seeds.dm

* works now
2020-09-14 19:40:06 +01:00
Theos
2dae33ac5b fixes cherries (#9412) 2020-08-12 09:51:30 -04:00
Wayward Horizons
a5cf9114a9 Allows plants to be renamed and makes hydroponic trays show the plant's name (#9287)
* Makes seeds and their products nameable

* Makes tray show plant
2020-07-27 13:26:37 -04:00
Wayward Horizons
2b87fb9925 Resprites the plant DNA manipulator! (w/ Partheo) (#9198)
* Does literally everything

* Partheo suggested change 1
2020-07-16 15:37:24 -04:00
alexkar598
dab25cb5a6 Dreamchecker (#8977)
* Changes obj_break on machines to use parent calls (#46485)

The way stat |= BROKEN was done was a mess, this makes everywhere use obj_break with proper parent calls and adds a signal for when a machine enters the broken state.
Why It's Good For The Game

Better code quality, more signals.

* e

* Can pass refactor (#48659)

* Makes all CanPass procs call parent

* Makes CanPass more extendable and gives the mover a say in the matter

* Replace CanPass with CanAllowThrough to use the new system

Regex replace `(?<!proc)/CanPass\(` => `/CanAllowThrough(`

* Simple optimization pass

* Adds linting for equipped() pickup() dropped() (#46614)

* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review

* does more

* Changes power_change() to respect parent calls for toggling NOPOWER (#46486)

About The Pull Request

Similar to #46485
Now all relevant uses of power_change() call parent, theres a signal sent when a machine changes the NOPOWER flag, all remaining machines that were using power_change() instead of update_icon() have been fixed.
Why It's Good For The Game

code quality, eventually signal stuff. and signal stuff

* Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)

About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167

* Makes Crossed and Moved should call parent (#49671)

* makes setDir shouldcallparent (#49692)

* owo

* hehe

* Update atoms.dm

* Update atoms.dm

* Update atoms_movable.dm

Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: alexkar598 <>
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-06-23 16:15:23 -04:00
Wayward Horizons
cbee26328f Adds contents to tower-caps and steel-caps (#8973)
* Update

* Gives towercaps and steelcaps reagent contents.

* Update yogstation.dme

* Update yogstation.dme

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-06-22 23:18:27 +01:00
Jamie D
dde1a5f6a1 Alot of control and alt click fixes, will need review (#8547)
* Portals now Ctrl Click on

* Portable Ctrl Clicks

* Lockboxes

* Mining Vendor

* Mining machine id

* Medical Machine id

* Suit Storage Ctrl Click Open

* Generators

* Grav Gen

* Plant Genes

* Outlet injectors

* Space heaters

* Tcomms Traffic Control

* Smes

* Cryo Cells

* Drying rack..

* Chemical Heater

* Quick Fixes

* Alt click is for tanks

* More fixes

* Alex likes User

* User REEEEEE

* Rad Collector

* Hopek Fixes

* Missed One - REEEEEEEEE

* Ai can now use things

* On Contruct (Anchored)

Would conflict otherwise

* Emitters and Collectors

* Fixes for Alexkar and Hopek

* Alexkar Good

* Brick

* I blame hopek

* I am Brick

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* No longer needed due to tgui

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-06-17 23:07:33 +01:00
TheGamerdk
5e514f81e7 Ports tgui-next 3.0, removes tgui 1.0 + Smart Asset Cache (#8291)
* Update Smes.js

* teleporter

* timer

* mining

* infra + prox

* uplink

* apc

* laser

* compile

* ui_x and ui_y and custom_materials

* 512

* smart asset cache

* vending machines

* Fixes missing icons. Removes rasta beanie

* cargo

* MULE + Intelli + Shuttle + Preferences

* AI fixer

* robot

* thing

* thing x2

* mecha

* compile

* oops

* Mining Vendor Fix

* Update traitordevices.dm

* Update proximity.dm

* Update EmergencyShuttleConsole.js

* rebuild

* uwu

* Revert "uwu"

This reverts commit de3ab5ff76.

* Update autodrobe.dm

* Update Vending.js

* Update _vending.dm

* Update Vending.js

* Update _vending.dm

* Build

* Update _vending.dm

* rebuild

* Update _vending.dm

* laser

* shuttle

* gigas

* signaller

* launchpad

* Update Vending.js

* eigthball

* pad

* ntnet relay

* labor stuff

* solar

* contrcators

* sprite fix

* Fixes contractor runtime (#45932)

* fix

* word change

* fixes contractor tablet (#47559)

* contractor

* ntos card console thing

* fixes

* dna console

* tweaks

* byondUI

* cargo hold

* fixes

* robit

* malf picker

* compile

* dependencies

* electropack

* transfer valve

* canvas

* fixes

* uplni stuff

* dna

* e

* tgui

* Octet separators in DNA Console genome sequencer. (#50516)

* Octet separators for the octet separator god.

* Code review changes

* REMOVES TGUI

* KNOB

* r

* tgui 3.0

* compile

* fixes

* fixes

* crafting fixes

* canister

* refactors

* bio gen

* MIT license

* seed

* Update NaniteCloudControl.js

* Update Uplink.js

* uwu

* oops

* fixes

* nanites

* Fixes nanite deactivation timer

* Revert "Fixes nanite deactivation timer"

This reverts commit c5fcfd34de.

* Revert "nanites"

This reverts commit eade3a61f4.

* various fixes

* compile

* turdis

* Update build_tgui.sh

* akwrard

* ha

* haha, HAHAHA!!

* compile

* fixes

* quick fix

* gps + dna fixes

* Compile

* DNA

* fixes

* sleeper + optable

* fixes

* mulebot

* Update cloning.dm

* Update cloning.dm

* Update ClockworkSlab.js

* Update Operating.dm

* Update nanite_chamber.dm

* Update nanites.dm

* Update nanites.dm

* Update stasis.dm

* Update asset_list_items.dm

* Update ClockworkSlab.js

* uwu

* oof

* Various FIxes + clockwork UI

* compile

* Sleeper fix

* Crew console

* AWKWARD

* PsiWeb

* uwu

* uwu

* psi web

* TGUI GONE

* compile

* autolethe

* Gulag + Solar

* Canister

* build

* private sale

* compile

* Update ntnrc_client.dm

* uwu

* canvas

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* compile

* rust_g 0.4.3

* rust_g 0.4.4

* paint

* fixed

* icons

* Update easter.dm

* Update yogstation.dme

* asset cache

* Update asset_cache.dm

* opops

* hmm

* hm

* oh no

* awkward

* Update asset_list_items.dm

* hey

* Update asset_list_items.dm

* Update asset_cache_item.dm

* last try

* Update asset_list_items.dm

* fuck it

* hmm

* Update asset_list_items.dm

* uwu

* Update client_procs.dm

* Update PDA.dm

* no i didn't

* Update guardianbuilder.dm

* Update solar.dm

* Update minimap.dm

* Update _vending.dm

* tgui

* Update skin.dmf

* Update tgui.bundle.js

* Fixes

* Update borg_monitor.dm

* nanite fix

* Update rust_g.dll

Co-authored-by: Neo <26365368+Neo-0@users.noreply.github.com>
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: nightred <nightred@gmail.com>
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>
Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com>
Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
Co-authored-by: MrPerson <spamtaffic@gmail.com>
Co-authored-by: Akrilla <mrtactical@hotmail.co.uk>
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: WarlockD <warlockd@gmail.com>
Co-authored-by: XDTM <heliumt@yahoo.it>
Co-authored-by: Sanator <39862806+Sanator@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Kelenius <kelenius@ya.ru>
2020-06-14 17:52:52 -04:00
ToGWtF
392996f035 adds rules to replica pods (#8790) 2020-06-05 10:42:28 -04:00