cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,723 Commits 7 Branches 0 Tags
11b005115eb84bc66dc1ee937d42b828a34c07c6
Commit Graph

25357 Commits

Author SHA1 Message Date
Novacat
5701af8b95 Update medbot.dm 2020-07-26 01:58:53 -04:00
Atermonera
c1638aa7b8 Fix scrubbers 2020-07-26 01:57:38 -04:00
Novacat
c14a7ea7b1 Merge pull request #8483 from Rykka-Stormheart/shep-dev-batter-fix 
Fix batter and all subtypes of it being unmake-able.
 2020-07-26 01:18:59 -04:00
Rykka
f18c8bfa0a Fix batter and all subtypes of it being unmake-able. 
Add water or beer BEFORE adding egg + flour together to avoid messing it up.
 2020-07-26 00:17:27 -04:00
Rykka
84d9798802 Medibot Interaction Hotfix 
Always check that you're passing the arguments a proc needs.

In this case, I was calling interact(), but not giving it a mob to interact with. Whoops.
 2020-07-25 23:09:09 -04:00
Novacat
e64b2a27cc Merge pull request #8471 from ShadowLarkens/tgui_med 
Medical TGUI
 2020-07-25 14:54:45 -04:00
Verkister
82b08a5266 Earlyports table/bench fix 
Polaris being slow
 2020-07-25 11:27:29 +03:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything 
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
 2020-07-25 00:44:51 -07:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires 
# Conflicts:
#	code/__defines/misc.dm
 2020-07-24 17:06:18 -07:00
Novacat
61314af7a1 Merge pull request #8463 from Rykka-Stormheart/shep-dev-null-reagent-fix 
Null R.Type fix and Fortune Cookie Fix
 2020-07-24 11:17:43 -04:00
Rykka
04024ad472 Null R.Type fix and Fortune Cookie Fix 
Fortune Cookies had special weird-as-shit code to handle leaving a piece of paper behind, and therefore just getting rid of the special-code seems the best option.

R.type is actually R.id on our codebase, so that was causing runtimes. This fixes those runtimes.

Also removes duplicate recipes from microwave.dm, and fixes the issue with recipes returning burnt mess.
 2020-07-24 10:05:39 -04:00
Novacat
8428de3dd4 Merge pull request #8461 from VOREStation/upstream-merge-7337 
[MIRROR] Persistent Trash/Dirt/Graffiti/Notices
 2020-07-24 09:22:33 -04:00
Novacat
5c120cd547 Merge pull request #8408 from VOREStation/upstream-merge-7334 
[MIRROR] Reorganized Library Computer Menu
 2020-07-24 09:09:00 -04:00
Unknown
5d7afad7c3 Conflict Resolution 2020-07-24 09:07:41 -04:00
Novacat
0e2e0db5cb Update lib_machines.dm 2020-07-24 08:55:11 -04:00
Novacat
a940d19a13 Update material_recipes.dm 2020-07-24 08:43:34 -04:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
2791419c98 Add Grill to Sorting List, Sort List by Appliance 2020-07-23 23:43:41 -04:00
Rykka
2b8b58433c Aurora Cooking Recipe Fixes 
Includes runtime fixes to recipe dump - now if a reagent is invalid, it will skip that item and runtime it so you can identify why.

Re-adds Peanut Oil and hotspot math for oil spills.
 2020-07-23 22:13:43 -04:00
Novacat
47b31301e8 Merge pull request #8413 from Rykka-Stormheart/shep-dev-aurora-cooking 
Aurora Cooking Port
 2020-07-23 02:53:46 -04:00
Shadow-Quill
29173ed58a Pressing Q now properly updates borg modules (#7357) 
* Press Q to refresh borg modules

* No usr for you
 2020-07-23 01:40:41 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
Verkister
4430c4eed4 Fixes panther rest icon not being used 2020-07-22 17:01:07 +03:00
Novacat
66c5b9124b Merge pull request #8450 from VOREStation/upstream-merge-7359 
[MIRROR] Clothes! (And rats)
 2020-07-22 09:13:47 -04:00
Novacat
65e337dcdc Merge pull request #8448 from VOREStation/upstream-merge-7355 
[MIRROR] Reduces spam from new event system.
 2020-07-22 09:13:17 -04:00
Schnayy
4cf5f95991 Clothes! (And rats) 2020-07-22 06:13:29 -04:00
Neerti
2aaca96081 Reduces spam from new event system. (#7355) 2020-07-22 06:04:38 -04:00
cadyn
dc5ddb7d01 Added options to shapeshifter verbs for gradients (#7348) 2020-07-22 06:01:47 -04:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Rykka
1ca8336bad Change to_world debug messages to runtimes instead 2020-07-22 01:49:16 -04:00
Rykka
839b9bb4c8 Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 19:21:51 -04:00
Novacat
8019c35d79 Merge pull request #8377 from lbnesquik/Kot-Smell-stuff 
Add a smell system, closely matching the flavor system.
 2020-07-21 18:14:01 -04:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff 
Adds dragon-y language and "*gao" emote
 2020-07-21 18:12:43 -04:00
Novacat
453fb2c708 Merge pull request #8432 from cadyn/custom-temp-resistance 
Added more custom species traits for temperature resistance
 2020-07-21 18:11:58 -04:00
Novacat
709d926e33 Merge pull request #8422 from ShadowLarkens/tgui 
TGUI-V4 w/ Camera Console
 2020-07-21 18:09:40 -04:00
Cadyn
ca7092c80c Minor grammar changes 2020-07-21 14:48:50 -07:00
Rykka
93a4631005 Various fixes and bugfixes from live playtests 2020-07-20 23:33:30 -04:00
Cadyn
fac86ebbd5 Combined opposite resistance and prone traits into nuetral adaptation traits and removed blooded traits. 2020-07-20 15:45:09 -07:00
Amy
ebaa88764d Brightens D'Rudak'Ar language color 2020-07-20 16:02:39 -05:00
Novacat
d27f46492e Merge pull request #8436 from Rykka-Stormheart/shep-dev-medbot-tipping 
Port Medibot Tipping!
 2020-07-20 12:56:37 -04:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
Rykka
e868d61994 Port Medibot Tipping! 
Ethics memes aside, the idea off people being caught off guard at their guilt for causing harm to inanimate objects is really funny to me, and feels extra relevant to SS13. Considering people already regularly get in fights and maim each other over harming station pets, I picture this being a great source of arguments and fights ICly over what torturing a cute lil' medbot says about you.

tl;dr this PR lets you tip over medbots which prevents them from moving or healing, and they'll slowly get more and more distressed and desperate asking for help from people around them. After a few minutes, if no one helps right them, they'll manage to right themselves up and snitch on whoever tipped them over to medical so the psychologist can keep an eye on them.
 2020-07-20 01:44:24 -04:00
Novacat
1df2bf91e3 Merge pull request #8428 from cadyn/tf-organ-reset 
Added organ reset to the transformation code
 2020-07-20 01:07:22 -04:00
Novacat
a07481aa93 Merge pull request #8431 from MrSign/sciborggutupgrade 
Increases the amount of items a sci-borg gut-analyzer can consume to 10.
 2020-07-20 01:05:44 -04:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
Atermonera
a26d43c7f9 Merge pull request #7353 from Shadow-Quill/CheckExportTick 
[SEMI-URGENT] Fixes hanging/crashing server when using the Export-Chatlog verb in OOC
 2020-07-19 23:38:46 -04:00
ShadowLarkens
4ccbe71a51 setSharedState fix (tgstation/tgstation#52323) 2020-07-19 17:30:46 -07:00
Kates
a559223fa8 Correct a small typo 2020-07-19 17:47:48 +02:00
Cadyn
046266f504 Quick fix for more dumb typos aaa 2020-07-19 00:04:59 -07:00