cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,369 Commits 5 Branches 0 Tags
84f16fecc23f45cf156a98053b53e69fff4d39bb
Commit Graph

38785 Commits

Author SHA1 Message Date
Novacat
84f16fecc2 Update 01_ui.dm 2020-08-21 23:32:07 -04:00
Atermonera
325afb857e Adds Repeating Ambience and Ambience Chance Preferences! 2020-08-21 23:30:59 -04:00
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Novacat
25e369e173 Merge pull request #8656 from serenekerosene/VOREstation 
Less wind per wind Correct Edition
 2020-08-21 17:13:12 -04:00
Novacat
6dd814c4d6 Merge pull request #8725 from dwinters99/flintlock_jacket 
Flintlock's jacket
 2020-08-21 17:12:31 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452 
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
 2020-08-21 13:32:51 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Novacat
4082d5355b Merge pull request #8785 from VOREStation/upstream-merge-7523 
[MIRROR] Ghost sechud verb, shift-click examine, alt-click turf tab
 2020-08-21 13:32:20 -04:00
Novacat
1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00
Rykka
9b2e3f8e5d Fixes filepaths to be correct with the new cone types 2020-08-21 08:00:29 -04:00
Rykka
56ee47720b Fix Merge Conflict in #8755 2020-08-21 07:54:07 -04:00
Verkister
5c50080377 Merge pull request #8754 from VOREStation/upstream-merge-7386 
[MIRROR] Reagent Hoses
 2020-08-21 14:25:55 +03:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Rykka
3fdd863afb Fixes conflicts with incoming Mirror #8756, Re-enables ecigs 
At this point, ecigs have been arbitrarily disabled for who knows how long for... no idea why, honestly?

I've added the missing .dmi and re-added ecigs to the .dme, in the interest of not conflict-fixing a million problems with vending machines.

E-cigs will need to be added to loadouts manually later.
 2020-08-21 05:42:43 -04:00
Rykka
16da38037d Fix incoming merge conflicts with PR #8757 
NIF Heatsinks will preserve their behavior of preventing BASE heat increases, but will not be able to compensate for if your NEW heatsink component is damaged or disabled.

Robolimb damage remains scalable as the conflict was simply taht the check was indented/nested underneath another.
 2020-08-21 05:26:49 -04:00
ShadowLarkens
7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04:00
Meghan-Rossi
470d76db4b Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers 
*Removes some autolathe entries made redundant by https://github.com/VOREStation/VOREStation/pull/8784
*Makes glass carafes and plastic pitchers batch-printable
 2020-08-21 07:58:44 +01:00
Novacat
4374731142 Merge pull request #8783 from VOREStation/upstream-merge-7522 
[MIRROR] Improve cleanbot ai slightly
 2020-08-21 01:42:29 -04:00
Novacat
4dc293b831 Merge pull request #8784 from VOREStation/upstream-merge-7521 
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:42:13 -04:00
Novacat
10bcf007c5 Merge pull request #8782 from VOREStation/upstream-merge-7519 
[MIRROR] Allows building plating on grass
 2020-08-21 01:41:51 -04:00
Novacat
c55f47fe64 Merge pull request #8778 from VOREStation/upstream-merge-7534 
[MIRROR] Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists
 2020-08-21 01:41:39 -04:00
Atermonera
8fc35d4da4 Merge pull request #7523 from Meghan-Rossi/ghostqol 
Ghost sechud verb, shift-click examine, alt-click turf tab
 2020-08-21 01:30:40 -04:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Atermonera
4eb14e5a0d Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak 
Improve cleanbot ai slightly
 2020-08-21 01:28:12 -04:00
Atermonera
83e9effdf7 Merge pull request #7519 from Meghan-Rossi/grassbuilding 
Allows building plating on grass
 2020-08-21 01:26:56 -04:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Novacat
89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
Novacat
52e67d6ed2 Merge pull request #8763 from VOREStation/upstream-merge-7488 
[MIRROR] Ports more Teshari clothes from Urist & Citadel
 2020-08-21 01:12:20 -04:00
Novacat
9207c1dd50 Merge pull request #8764 from VOREStation/upstream-merge-7492 
[MIRROR] Skrell blood is now hemocyanin-based
 2020-08-21 01:12:00 -04:00
Novacat
c41e350d6d Merge pull request #8768 from VOREStation/upstream-merge-7497 
[MIRROR] Cancelling choosing someone to admin PM won't say "no mob"
 2020-08-21 01:11:43 -04:00
Novacat
dc48492db5 Merge pull request #8774 from VOREStation/upstream-merge-7509 
[MIRROR] Stop bots standing around blocking doors
 2020-08-21 01:11:26 -04:00
Novacat
86b3e694f2 Merge pull request #8769 from VOREStation/upstream-merge-7496 
[MIRROR] Add a plastic knife to the pizzzaaaaa crate.
 2020-08-21 01:11:08 -04:00
Novacat
eab980a15b Merge pull request #8766 from VOREStation/upstream-merge-7494 
[MIRROR] Delete some duplication in the mech drill
 2020-08-21 01:10:23 -04:00
Novacat
445c233bdf Merge pull request #8762 from VOREStation/upstream-merge-7489 
[MIRROR] Make it quicker to unfasten pipes.
 2020-08-21 01:10:05 -04:00
Novacat
a117c4efc6 Merge pull request #8761 from VOREStation/upstream-merge-7487 
[MIRROR] Adds shift-middle click pointing
 2020-08-21 01:09:36 -04:00
Novacat
785a8eeb37 Merge pull request #8773 from VOREStation/upstream-merge-7502 
[MIRROR] Fix duct tape on self
 2020-08-21 01:08:59 -04:00
Novacat
373b61c33c Merge pull request #8772 from VOREStation/upstream-merge-7503 
[MIRROR] Replaces cable attack_ghost with normal examine
 2020-08-21 01:08:43 -04:00
Atermonera
e89409e64b Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists 2020-08-21 00:12:11 -04:00
Meghan-Rossi
133296814a Stop bots standing around blocking doors (#7509) 
* Idle bots will move out of doorways

Idle bots will move out of doorways, including turfs with firedoors or blastdoors.

* +changelog

* fix parentheses
 2020-08-20 22:32:09 -04:00
Atermonera
3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -04:00
Atermonera
08cc205c35 Merge pull request #7503 from Cyantime/patch-2 
Replaces cable attack_ghost with normal examine
 2020-08-20 22:24:32 -04:00
Atermonera
4f0f345647 Merge pull request #7507 from listerla/shieldgen 
De-capitalizes shield generators
 2020-08-20 22:24:21 -04:00
Atermonera
444b2e6286 Merge pull request #7496 from lbnesquik/Kot-Pizza-tweak 
Add a plastic knife to the pizzzaaaaa crate.
 2020-08-20 22:21:53 -04:00
Atermonera
45b1b77f42 Merge pull request #7497 from Shadow-Quill/AdminPM 
Cancelling choosing someone to admin PM won't say "no mob"
 2020-08-20 22:21:42 -04:00
Atermonera
3c52b46be9 Merge pull request #7494 from lbnesquik/Kot-drill-zeven-tweak 
Delete some duplication in the mech drill
 2020-08-20 22:19:11 -04:00
listerla
85536ea0fd Skrell blood is now hemocyanin-based (#7492) 
* Skrell blood is now hemocyanin-based

Inspired by Aurora

* Update Chemistry-Reagents-Dispenser.dm

* Create Lorilili - hemocyanin.yml
 2020-08-20 22:17:58 -04:00
listerla
ebbea6ebc8 Ports more Teshari clothes from Urist & Citadel (#7488) 
* Ports more Teshari clothes from Urist & Citadel

* Accidentally deleted one sprite, undeleting now
 2020-08-20 22:16:42 -04:00
Atermonera
bb4e0d669b Merge pull request #7489 from lbnesquik/kot-pipe-tweak 
Make it quicker to unfasten pipes.
 2020-08-20 22:16:31 -04:00