cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,485 Commits 8 Branches 0 Tags
c69d4ab48a079a48e2cc3eaed4ad90b54a671663
Commit Graph

17233 Commits

Author SHA1 Message Date
Rykka
cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Rykka
56d7235525 Adds Knight Boots to vendor/crate/POI, adds Lennie/George to Tether 2020-08-26 22:19:19 -04:00
Rykka
6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits 
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
 2020-08-26 21:58:30 -04:00
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
Novacat
b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Cadyn
f18c075cfd Feedback and forgot the VS edit goodies 2020-08-23 20:41:03 -07:00
Cadyn
0d0cd61e60 Yummy bugfixes 2020-08-23 20:24:04 -07:00
Novacat
cb125004dc Merge pull request #8818 from Rykka-Stormheart/shep-dev-portalize-tether 
Converts Step_triggers to Portals!
 2020-08-23 16:40:29 -04:00
Rykka
c71dba5cae Converts Step_triggers to Portals! 
Implements Portal Functionality to replace the older step_triggers!

Z-level transitions are now 99.9% seamless!

It's self-explanatory, images below in editor:
![](https://i.imgur.com/EBr9mnN.png)
![](https://i.imgur.com/lP0UQxT.png)
![](https://i.imgur.com/c6VX1EC.png)
![](https://i.imgur.com/dfqDz75.png)
![](https://i.imgur.com/pUNVmBG.png)

In-game Version:
To Surface Mining:
![](https://i.imgur.com/aoJIwps.png)
![](https://i.imgur.com/nqVCYV9.png)
To Solars:
![](https://i.imgur.com/FRb6ZKB.png)
To Plains/Wilderness:
![](https://i.imgur.com/Y8kf40k.png)
 2020-08-22 20:36:49 -04:00
Cyantime
ae94023362 Patches potential maybe-exploit in bomb simulator 2020-08-22 19:21:11 -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
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -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
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
ShadowLarkens
7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04: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
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
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
Atermonera
3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -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
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Novacat
e66cf2eb57 Merge pull request #8741 from ShadowLarkens/tgui_exploration 
TGUI exploration
 2020-08-20 18:52:52 -04:00
Meghan-Rossi
87f41b6527 Fixes not being able to relabel canisters 
Fixes https://github.com/VOREStation/VOREStation/issues/8746
 2020-08-20 17:16:04 +01:00
ShadowLarkens
02bb4637eb TGUI Point Defense Mainframe & Advanced Shield Generator 2020-08-18 20:42:59 -07:00
ShadowLarkens
61faa8057c Brig timer adjustment & camera console panning 2020-08-18 13:47:43 -07:00
ShadowLarkens
39fd76aafb TGUI Dna Scanner 2020-08-18 07:58:00 -07:00
ShadowLarkens
cefe1a0b3c TGUI Brig Timer, Prisoner Management Console, and Security Records 2020-08-18 07:57:13 -07:00
Novacat
8079ce2f0f Merge pull request #8720 from ShadowLarkens/tgui_cargo 
TGUI Cargo
 2020-08-18 09:48:13 -04:00
Verkister
cb9d6f47e8 Merge pull request #8332 from lbnesquik/Kot-Sec-Tweak 
Grant brig access to the detective as a .vr tweak
 2020-08-18 16:08:13 +03:00
Mechoid
ccd5993b38 Exosuit Upkeep (#7473) 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
 2020-08-17 18:19:51 -04:00
listerla
c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
ShadowLarkens
5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07:00
ShadowLarkens
aea68811f6 TGUI Request Console (and Fix TGUI verb) 2020-08-16 22:27:08 -07:00
ShadowLarkens
78d1d2e9a1 TGUI Supply Computer 2020-08-16 22:27:08 -07:00
Novacat
005c47fa91 Merge pull request #8715 from VOREStation/upstream-merge-7451 
[MIRROR] Tweak to the washing machine.
 2020-08-17 00:25:13 -04:00
Novacat
d4289ada63 Merge pull request #8719 from VOREStation/revert-8716-upstream-merge-7426 
Revert "[MIRROR] Disable breaking fragile floor tiles with the crowbar"
 2020-08-17 00:25:00 -04:00