cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 7 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

49961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Novacat
d9ada5bc0e Update scrubber.dm 2020-01-21 01:16:11 -05:00
Novacat
18963d3714 Update Sleeper.dm 2020-01-21 01:15:30 -05:00
Novacat
144947be6f Update vorestation.dme 2020-01-21 01:14:46 -05:00
Novacat
c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
Novacat
22fe5795e4 Merge pull request #6479 from VOREStation/upstream-merge-6622 
[MIRROR] Water resistance exists
 2020-01-21 01:12:49 -05:00
Novacat
59ef7b48cf Update retail_scanner.dm 2020-01-21 01:12:12 -05:00
Novacat
213545ed98 Update cash_register.dm 2020-01-21 01:11:42 -05:00
Novacat
c14f3340ff Update light.dm 2020-01-21 01:11:19 -05:00
Novacat
110d37a4e5 Update misc_special.dm 2020-01-21 01:11:02 -05:00
Novacat
aeee2fd56d Update admin_secrets.dm 2020-01-21 01:10:34 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
VirgoBot
6f876b8aee Water resistance exists 2020-01-20 22:51:52 -05:00
Atermonera
5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists 
Water resistance exists
 2020-01-20 22:51:52 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Rykka
0b6ace1a3b Smol grammar fix 2020-01-20 18:24:56 -07:00
Rykka
d0f391c650 Earlyport mech fixes, Fix Polecat armor issues 2020-01-20 18:22:05 -07:00
Heroman
80bb2bc539 Moves colormate, one more decal 2020-01-20 16:53:43 +10:00
Novacat
c877f3d265 Merge pull request #6476 from Heroman3003/botnovore 
Fixes bots being able to do vore
 2020-01-19 20:42:32 -05:00
Heroman
27127a11e0 Fixes bots being able to do vore 2020-01-20 11:08:04 +10:00
Heroman
4b8d3690f3 Adds a newscaster to surface EVA 2020-01-20 10:34:29 +10:00
Novacat
c8a74c69ea Merge pull request #6475 from Heroman3003/derelict-change 
Replaces autocloner on alien derelict PoI
 2020-01-19 19:22:39 -05:00
Heroman
d56ea73e51 Adds a single corner stripe 2020-01-20 09:54:09 +10:00
Heroman
d0c64d52a0 Replaces autocloner on alien derelict PoI 2020-01-20 09:17:16 +10:00
Heroman
30167552e5 Finishes look-over, does mapmerge 2020-01-20 08:27:48 +10:00
Heroman
ef0194854c Merge branch 'master' of https://github.com/VOREStation/VOREStation into mapover 2020-01-20 07:36:46 +10:00
Heroman
79c151946e Adjustments for z-1 and z-3 2020-01-20 07:36:30 +10:00
Novacat
eb2126138b Merge pull request #6472 from TheFurryFeline/TFF-Drone_Frab_Transport 
[Map] Drone Fab Transport
 2020-01-19 16:18:55 -05:00
Novacat
56dfcef1cf Merge pull request #6473 from TheFurryFeline/patch-16 
Sec Cart Key Fixy
 2020-01-19 13:37:42 -05:00
TheFurryFeline
5b179a8035 Sec Cart Key Fixy 
Title. Fixes a downstream issue. This fixes  https://github.com/Yawn-Wider/YWPolarisVore/issues/465

Changelog Notes:

- Fixes broken key usage that, once taken out of the Security Cart, you can't put it back inside the vehicle.
 2020-01-19 13:05:44 -05:00
TheFurryFeline
9ec9cb1961 [Map] Drong Fab Transport 
Derped with the branch name, pfft. Whatever. This is just a thing to add yet another mailing tag but mainly for drones to use.

Changelog Notes:

- Allows self-mailing of maint drones to go straight back to Drone Fabrication via disposals.
 2020-01-19 11:17:25 -05:00
Novacat
d5324402c5 Merge pull request #6471 from VOREStation/upstream-merge-6633 
[MIRROR] Light Frame Infinite Steel Fixy
 2020-01-19 01:34:32 -05:00
VirgoBot
7fd6641756 Light Frame Infinite Steel Fixy 2020-01-19 00:51:24 -05:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633) 
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
 2020-01-19 00:51:24 -05:00
Spades
eeb023b0b7 Merge pull request #6470 from VOREStation/upstream-merge-6631 
[MIRROR] Removes Alert from 6617
 2020-01-17 08:55:23 -05:00
VirgoBot
d071324fd7 Removes Alert from 6617 2020-01-17 03:50:13 -05:00
Shadow-Quill
4bd6a61c94 Alert Revert (#6631) 2020-01-17 03:50:13 -05:00
Novacat
d27721ae2d Merge pull request #6469 from VOREStation/iprtogl 
IP reputation check toggle verb
 2020-01-16 15:21:24 -05:00
Aronai Sieyes
2b4064e5cf IP reputation check toggle verb 2020-01-16 10:11:44 -05:00
Novacat
ad30a2c9c7 Merge pull request #6468 from VOREStation/upstream-merge-6627 
[MIRROR] Fixes alt-titles with custom outfit not having access
 2020-01-16 08:59:46 -05:00
Novacat
76ff478822 Merge pull request #6467 from VOREStation/upstream-merge-6624 
[MIRROR] Changeling Item Name/Desc Fixy
 2020-01-16 08:59:33 -05:00
Novacat
463e4ccdb7 Merge pull request #6466 from VOREStation/upstream-merge-6626 
[MIRROR] Fixes loadout index runtime spam
 2020-01-16 08:59:11 -05:00
Heroman3003
cbbff151fb Fixes alt-titles with custom outfit not having access 2020-01-16 02:57:31 -05:00
VirgoBot
82d2b5b3e2 Changeling Item Name/Desc Fixy 2020-01-16 02:56:14 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624) 
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
 2020-01-16 02:56:14 -05:00
VirgoBot
0e17a0b5a9 Fixes loadout index runtime spam 2020-01-16 02:56:04 -05:00
Verkister
fa0a6d88a8 Fixes loadout index runtime spam (#6626) 
sanity checks saving the day once more.
 2020-01-16 02:56:04 -05:00
Heroman
6d3a1608a2 Fixes random missing decls 2020-01-16 17:44:44 +10:00
Heroman
ea33b6be4e WHY 2020-01-16 17:40:28 +10:00