cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 7 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

2733 Commits

Author SHA1 Message Date
cadyn
a8d22c84a8 fix stupid shit 2020-11-21 19:12:41 -08:00
cadyn
1da78774a8 Even more conflicts. Yum. 2020-11-21 18:52:36 -08:00
cadyn
c23558a35d More conflicts yay 2020-11-21 18:51:16 -08:00
Chompstation Bot
2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
Verkister
270aa28416 Merge pull request #9290 from VOREStation/upstream-merge-7751 
[MIRROR] Ports some clothing from uristcode
 2020-11-08 06:58:52 +00:00
Razgriz
e53b5088a0 Merge pull request #706 from CHOMPStationBot/upstream-merge-9232 
[MIRROR] [MIRROR] [FIX] Magboot & RIG Contamination/PHORONGUARD Usage
 2020-10-19 18:12:16 -07:00
Razgriz
946a258f59 Merge pull request #703 from CHOMPStationBot/upstream-merge-9237 
[MIRROR] [MIRROR] Fixes suit blood overlays on mobs not displaying.
 2020-10-19 18:08:21 -07:00
Verkister
ae0a6247ef Merge pull request #9232 from VOREStation/upstream-merge-7718 
[MIRROR] [FIX] Magboot & RIG Contamination/PHORONGUARD Usage
 2020-10-19 10:37:39 +00:00
Verkister
b7fc7ac1bb Merge pull request #9237 from VOREStation/upstream-merge-7728 
[MIRROR] Fixes suit blood overlays on mobs not displaying.
 2020-10-19 10:37:16 +00:00
Verkister
fb1b3d210e Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-19 10:36:41 +00:00
Cadyn
f0cddb7b1e One more bugfixy 2020-10-05 20:00:43 -07:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
31c1375b68 Fix RIG crashes & Chem Injector 2020-10-02 22:33:30 -07:00
David Winters
93f9e1908d fixes #9099 2020-09-29 04:28:40 -04:00
Atermonera
123a0fd115 Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch 
Teshari sprites and white eyepatch
 2020-09-26 16:58:44 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
d8c7593395 Merge pull request #7725 from Little-119/shiny-clothing 
Add Romantical Whale's "Shiny Clothing"
 2020-09-05 12:37:15 -04:00
Novacat
807d89d9e9 Merge pull request #8957 from ShadowLarkens/tgui_civ 
TGUI Civilian (except no double travis)
 2020-09-04 19:32:32 -04:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
David Winters
5c63b01475 ding ding 2020-09-02 00:21:17 -04:00
Novacat
d5f18ddb2e Merge pull request #8933 from VOREStation/upstream-merge-7552 
[MIRROR] Adds hailer gas (face) masks.
 2020-08-31 23:57:14 -04:00
Unknown
c024404024 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7552 2020-08-31 23:39:16 -04:00
Atermonera
500d859fd6 Merge pull request #7587 from listerla/teshclothesfix 
Fixes Teshari dresses
 2020-08-31 23:35:51 -04:00
Atermonera
18060684ac Stop in the name of the law, open tag. 2020-08-31 22:36:05 -04:00
Atermonera
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Atermonera
57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
f0bfa69416 Merge pull request #7558 from Cyantime/lanternlight 
Returns the jackolantern overlay
 2020-08-27 19:58:53 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Little-119
bcb07cfeef Add Romantical Whale's "shiny" clothes 2020-08-27 18:08:36 -04:00
Little-119
ab605557ef Add polychromic clothing procs 2020-08-27 16:19:26 -04:00
Braiden
62bfd69431 small tweaks 
fixed some spelling errors and adjusted tesh roboticist belted cloak sprite
 2020-08-27 03:21:00 -05: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
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat
8301f7832d Merge pull request #8363 from KillianKirilenko/kk-misc 
AR Glasses Tweaks
 2020-08-23 13:14:37 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Verkister
f511641363 Fixes a copypaste slip with heat protection (#7536) 
Found while digging around for something else
 2020-08-22 04:12:32 -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
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