cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,758 Commits 7 Branches 0 Tags
7d9305da76a7eb96d8fb91a5efca69dc9577db8d
Commit Graph

38443 Commits

Author SHA1 Message Date
Novacat
7d9305da76 Merge pull request #8508 from ShadowLarkens/patch-1 
Revert unintentional nerf to sleepers
 2020-07-28 05:03:29 -04:00
ShadowLarkens
4f2bb7bc34 Fix ghosts being unable to interact with TGUI by default 2020-07-28 01:16:00 -07:00
ShadowLarkens
fe597f18dc Revert unintentional nerf to sleepers 
Whoops. Swore I read a -25 health limitation to injecting people before TGUI, but that wasn't the case. This fixes a bug introduced by #8471
 2020-07-28 00:01:41 -07:00
Rykka
0800f05c31 Fix for Camera interaction for Borgs/Drones. 
To note - the original change was intentional change on Paradise/Polaris's part.

"You might not have been able to actually view the cameras, but you should have been able to open the interface."
 2020-07-27 05:28:17 -04:00
Novacat
c4f7aed7f4 Merge pull request #8215 from dwinters99/spellcheck 
Minor typo fixes
 2020-07-27 01:55:24 -04:00
Novacat
9e72efca03 Update clothing.dm 2020-07-27 01:43:56 -04:00
lbnesquik
2834a0b9c6 Correct a typo with the smelling ability. 2020-07-27 05:27:06 +02:00
Novacat
2a8d652cc0 Merge pull request #8493 from ShadowLarkens/weh 
Fix engineering camera consoles seeing all cameras
 2020-07-26 23:14:36 -04:00
ShadowLarkens
121a711265 Fix camera consoles being broke as fuck 2020-07-26 19:52:03 -07:00
Rykka
15da4a522f Rename Alcoholic Version of Love Potion to The Love Maker 
Should prevent the alcoholic version of Love Potion appearing fucking everywhere.
 2020-07-26 20:29:10 -04:00
Cyantime
5eefadf78b Update netgun design name 2020-07-26 17:06:57 -04:00
Novacat
344d5cb77a Merge pull request #8486 from Rykka-Stormheart/shep-dev-nutri-spread 
Fix for Nutrispread not being available and Alternative Method for UE
 2020-07-26 08:33:02 -04:00
Rykka
453715bfb3 Fix for Nutrispread not being available and Alternative Method for UE 
Allows you to get Universal Enzymes via the Biogenerator and Nutri-spread from the biogenerator.

Re-color-codes the biogenerator menu.
 2020-07-26 08:05:53 -04:00
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
Novacat
57b5a9cace Merge pull request #8474 from SweetBlueSylveon/service-bock-fix 
Service Remap tweak
 2020-07-25 11:18:13 -04:00
SweetBlueSylveon
ee60a1b717 Fixes a large number of issues brought up. 
Fixes the roof for surface med.
Adds lights.
Changes the hallway disposals to a bin in the entertainment room.
Gives clowns entertainment access.
Fixes a pipe's visibility.
Adds shutter and tint control buttons where they were missing.
No the I'm not moving the goat he's my friend and he's staying in the freezer.
 2020-07-25 05:23:15 -07: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
Verkister
6f5c5ddf33 Earlyports melee exploit fix 
*incoherent groaning*
 2020-07-24 18:26:19 +03: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
c4476fc51c Why is this still here 2020-07-24 09:08:18 -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
Rykka
c1a5aee641 Merge branch 'master' into Tether-Tweak 2020-07-23 04:08:25 -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
Novacat
c024b515de Merge pull request #8441 from VOREStation/upstream-merge-7342 
[MIRROR] Flavour Enhancement: Crates
 2020-07-22 18:25:03 -04:00
Novacat
cdeb6b73cc Update supply.dm 2020-07-22 18:02:16 -04:00
Unknown
382e676ee2 Compatability fixes 2020-07-22 17:37:47 -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
Novacat
cced5b4730 Merge pull request #8447 from VOREStation/upstream-merge-7343 
[MIRROR] Allow you to only select mech weapons when cycling.
 2020-07-22 09:12:59 -04:00
Novacat
254b318332 Merge pull request #8446 from VOREStation/upstream-merge-7351 
[MIRROR] Removes superfluous punctuation
 2020-07-22 09:12:41 -04:00
Schnayy
4cf5f95991 Clothes! (And rats) 2020-07-22 06:13:29 -04:00