cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,755 Commits 6 Branches 0 Tags
fe597f18dcd7e79ff246c79aa30dfeb43348fe86
Commit Graph

53755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Novacat
72b55ccf03 Merge pull request #8504 from SweetBlueSylveon/small-counter-fixer 
Another small service patch.
 2020-07-27 22:27:00 -04:00
Novacat
4ec0c1f920 Merge pull request #8505 from Novacat/nova-basicfixes 
Updates Dropship
 2020-07-27 22:26:45 -04:00
Unknown
6357b9f9e7 Updates Dropship 2020-07-27 19:41:56 -04:00
SweetBlueSylveon
869e8bae97 dmm2tgm 2020-07-27 15:52:20 -07:00
SweetBlueSylveon
ea2507ec46 Fixes issue with xenobot lockers. 
Fixes the access on the xenobotany lockers, and puts another sink in xenobotany.
 2020-07-27 15:49:12 -07:00
SweetBlueSylveon
68839aefa1 Small fix. 
Moves stuff around on the kitchen shutter counter.
Moves the kitchen shutter button out from behind an appliance.
Moves the rancher jim note back in front of the freezer.
Changes one tile of area.
 2020-07-27 15:39:47 -07:00
Novacat
a9f38fba51 Merge pull request #8503 from VOREStation/Verkister-patch-1 
Reverts the forced sharp scaling on map window.
 2020-07-27 15:04:43 -04:00
Verkister
ea500e8cc4 Reverts the forced sharp scaling on map window. 
A bandaid fix that'll hopefully be replaced with an actual preference toggle button rather than the upstream fetish of hardcoding and forcing client preferences without access buttons to them.
Basically fixes map window having turned to sharp scaling, meaning that using the "stretch to fit" mode will mangle the entire screen if someone needs a little bit of a tweak. Most screens aren't big enough to blur the map window noticeably and if you're on a 4k screen, set your icon mode to 96 or 128 for fuck's sake.
 2020-07-27 17:13:00 +03:00
Novacat
b8d113b255 Merge pull request #8500 from Rykka-Stormheart/shep-dev-borg-cam-fix 
Fix for Camera interaction for Borgs/Drones.
 2020-07-27 08:26:50 -04: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
Novacat
e59ebf13f5 Merge pull request #8496 from lbnesquik/Kot-Smell-stuff 
Correct a typo with the smelling ability.
 2020-07-26 23:52:55 -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
Novacat
2ecf2aad2d Merge pull request #8492 from Rykka-Stormheart/shep-dev-kitchen-pass-dos 
Minor Map Changes to Service, Add Second Arcade Machine
 2020-07-26 21:22:31 -04:00
Novacat
f408df18ef Merge pull request #8491 from Rykka-Stormheart/shep-dev-love-drunk 
Rename Alcoholic Version of Love Potion to The Love Maker
 2020-07-26 21:22:11 -04:00
Rykka
7b7947b252 Minor Map Changes to Service, Add Second Arcade Machine 2020-07-26 21:02:25 -04:00
Novacat
e45c69d2b8 Merge pull request #8490 from SweetBlueSylveon/punpun-fix 
Kitchen patch (mostly)
 2020-07-26 20:31:44 -04: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
SweetBlueSylveon
1de81b3bed dmm2tgm2dmm2tgm2dmm2tgm 2020-07-26 17:08:37 -07:00
Novacat
a2385d0744 Merge pull request #8489 from Cyantime/patch-2 
Update netgun design name
 2020-07-26 20:04:17 -04:00
SweetBlueSylveon
11b005115e Kitchen patch (mostly) 
A moderate overhall to the kitchen to make it feel less overly spacious, while still keeping the extra walking room.
Changes some shutter directions.
Puts punpun in the backroom.
 2020-07-26 16:55:56 -07: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
Novacat
59321b2636 Merge pull request #8485 from VOREStation/upstream-merge-7375 
[MIRROR] Fix scrubbers
 2020-07-26 08:30:36 -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
Novacat
f61ee1ccc3 Merge pull request #8482 from Rykka-Stormheart/shep-dev-medbot-hotfix 
Medibot Interaction Hotfix
 2020-07-26 00:12:48 -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
bce3263f25 Merge pull request #8477 from SweetBlueSylveon/service-patchey 
Final patch.
 2020-07-25 21:45:23 -04:00
SweetBlueSylveon
4fe5b7a558 dmm2tgm 2020-07-25 13:07:40 -07:00
SweetBlueSylveon
c9e3131ac0 Sink in the bar 2020-07-25 12:42:59 -07:00
SweetBlueSylveon
4763e6042b Final patch. 2020-07-25 12:24:35 -07:00
Novacat
e64b2a27cc Merge pull request #8471 from ShadowLarkens/tgui_med 
Medical TGUI
 2020-07-25 14:54:45 -04:00
Aronai Sieyes
6a79e6e409 Merge pull request #8475 from SweetBlueSylveon/service-patch-2 
Another update for service.
 2020-07-25 12:36:42 -04:00
SweetBlueSylveon
37d05f1db3 dmm2tgm 2020-07-25 08:46:18 -07:00
SweetBlueSylveon
5209b5f235 Another update for service. 
Adds some better phoron breach protection.
Moves some stuff around in the kitchen.
 2020-07-25 08:42:02 -07:00
Novacat
57b5a9cace Merge pull request #8474 from SweetBlueSylveon/service-bock-fix 
Service Remap tweak
 2020-07-25 11:18:13 -04:00
Novacat
36339e03fe Merge pull request #8472 from VOREStation/Verkister-patch-1 
Earlyports table/bench fix
 2020-07-25 11:17:48 -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
Novacat
b36add6538 Merge pull request #8444 from ShadowLarkens/tgui_wires 
Port TGUI Wire datums & Colorblind Wires
 2020-07-24 21:12:48 -04:00
Novacat
7d7daea7e2 Merge pull request #8468 from Rykka-Stormheart/shep-dev-cooking-table-emergency-fix 
PR to update kitchen so all appliances are useable
 2020-07-24 21:12:28 -04:00