cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,048 Commits 8 Branches 0 Tags
1551077cf86a0425ea98bc2f15d24b1ee1472ca6
Commit Graph

34588 Commits

Author SHA1 Message Date
Novacat
1551077cf8 Merge pull request #5354 from VOREStation/upstream-merge-6219 
[MIRROR] Tweaks the NewTM event system further
 2019-06-21 16:43:41 -04:00
Novacat
6ebbb6935e Update planet_weather_change.dm 2019-06-21 15:13:01 -04:00
Novacat
2338bccb57 Update planet_weather_change.dm 2019-06-21 01:34:12 -04:00
Novacat
6c3134b63d Update planet_weather_change.dm 2019-06-21 00:16:51 -04:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208) 
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
 2019-06-21 00:14:05 -04:00
Unknown
cb3b4c9ae8 Changes weather 
I... really do not like how this is setup.
 2019-06-19 23:47:44 -04:00
Anewbe
d017075732 Merge pull request #6219 from Mechoid/Event_Retweakening 
Tweaks the NewTM event system further
 2019-06-19 23:34:26 -04:00
Unknown
f1d61de589 Buffs Lights post-light changes 2019-06-18 21:20:06 -04:00
Novacat
6e0f81065d Merge pull request #5348 from VOREStation/upstream-merge-6196 
[MIRROR] An assortment of Lighting Stuff
 2019-06-18 20:41:50 -04:00
Novacat
d9db3676eb GRUMBLE GRUMBLE CODE STANDARDS GRUMBLE GRUMBLE 2019-06-18 20:33:21 -04:00
GeneriedJenelle
12df030c0a Adds Cider Bottles (#6201) 
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
 2019-06-18 20:05:06 -04:00
Novacat
0c5e7c5de6 Update lighting.dm 2019-06-18 20:01:52 -04:00
Novacat
03a3944f36 An assortment of Lighting Stuff 2019-06-18 19:57:40 -04:00
Novacat
d9168b3ccd Merge pull request #5343 from TheFurryFeline/TFF-Indigestible_Collar 
Indigestible Collar
 2019-06-18 17:51:38 -04:00
Novacat
63f93cc97b Merge pull request #5332 from Verkister/dogsitting 
Adds resting pose selection to dogborgs
 2019-06-18 17:51:13 -04:00
Novacat
9ac9317657 Merge pull request #5320 from Ketrai/fishingrod 
Adds a durasteel fishing rod.
 2019-06-18 17:50:55 -04:00
Woodratt
8c3a430e8d June Map Adjustments 2019-06-18 13:34:12 -04:00
Mechoid
595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215) 
* MakeMeleeGreatAgain

* Where is melee defined?!
 2019-06-18 05:51:23 -04:00
TheFurryFeline
108ef8a53c Switching File Location 
Moves the new holocollar type to go with the rest of the accessories.
 2019-06-17 16:34:51 -04:00
TheFurryFeline
d94e166347 Indigestible Collar 
Adds a new loadout item, a variation of the holo-collar with the intention of surviving digestion of its wearer. Approved, pretty much, from https://forum.vore-station.net/viewtopic.php?f=26&t=1531&sid=d3664ec3c397cebbf9a62e2e18fbb6f6
 2019-06-17 11:43:56 -04:00
Novacat
a251e5bfc8 Merge pull request #5342 from VOREStation/upstream-merge-6199 
[MIRROR] Grey scale pills and colored pillbottles
 2019-06-16 22:02:21 -04:00
Novacat
b7205d3b60 Update pill.dm 2019-06-16 21:51:52 -04:00
Novacat
ed7268b66c Merge pull request #5341 from VOREStation/upstream-merge-6216 
[MIRROR] Fixes the Chargeblade's tech cost.
 2019-06-16 21:50:54 -04:00
Novacat
4a4bc120a5 Merge pull request #5339 from VOREStation/upstream-merge-6214 
[MIRROR] Fixes ghost-edge runtime
 2019-06-16 21:50:25 -04:00
Novacat
10c8417542 Merge pull request #5338 from VOREStation/upstream-merge-6079 
[MIRROR] Augment Work
 2019-06-16 21:50:16 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Mechoid
07cceab5bc Fixes the Chargeblade's tech cost. (#6216) 
* Fixes the Chargeblade's tech cost.

* Update illegal.dm
 2019-06-16 21:17:26 -04:00
Anewbe
d34b2784bb Merge pull request #6214 from Heroman3003/edge-time 
Fixes ghost-edge runtime
 2019-06-16 20:58:42 -04:00
Anewbe
50ff14f8f8 Merge pull request #6079 from Mechoid/AugmentPreWork 
Augment Work
 2019-06-16 20:58:32 -04:00
Anewbe
223dc48961 Merge pull request #6218 from Mechoid/RandomSpawnerFix 
Fixes random item spawners not self-deleting.
 2019-06-16 20:57:20 -04:00
Verkister
ff8d89db07 Merge pull request #5325 from Verkister/ridethesausage 
Brings back oties and adds riding.
 2019-06-13 14:25:39 +03:00
Spades
fafd7675ef Merge pull request #4986 from Heroman3003/zoooooooom 
Rebalances zoom pills
 2019-06-12 17:11:48 -04:00
Verkister
c38789b7fb Adds resting pose selection to dogborgs 
-New verb to choose between resting/sitting/belly-up poses.
-New sprites for all the animated borgs (and maybe the rest later when they get anims and shit)
-Resting, sitting, and belly-up poses now come in all directions. (on the currently finished set)
-New placeholder sprite to prevent invisible borgs just in case.
-Rearranged the contents of the sprite file to a more consistent order.
-Ported the animated version of dark medihound, also gave it the poses.
 2019-06-12 23:13:18 +03:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms 
Adds worms
 2019-06-11 17:35:11 -04:00
Verkister
4f09f1a4cf Makes mechanical prefs show disabled OOC/LOOC 
Salt PR to rob people from their ability to conceal whether they're ignoring other players' ooc messages mechanically or out of malice and then wondering why things are going to shit and people are getting mad at them.
 2019-06-11 17:50:32 +03:00
Verkister
de0749bff3 damage nerf 2019-06-11 08:31:20 +03:00
Novacat
8680ad38c7 Merge pull request #5328 from Heroman3003/goosefix 
Fixes geese escaping the wilderness
 2019-06-10 18:53:04 -04:00
Heroman
0c1ea5c98d Replaces different AI with shutters 2019-06-11 07:11:20 +10:00
Novacat
a925985b91 Merge pull request #5322 from Heroman3003/fluffening 
Updates fluff item lists and whitelist
 2019-06-10 13:18:53 -04:00
Novacat
ea38a066fe Merge pull request #5329 from VOREStation/Verkister-patch-2 
Fixes rapala missing base_color
 2019-06-10 13:18:31 -04:00
Novacat
65f1d76130 Merge pull request #5323 from Verkister/gripthatshit 
Engie dog fixes and tweaks.
 2019-06-10 13:00:51 -04:00
Verkister
ea2c7077c7 Fixes rapala missing base_color 
-Basically fixes adminspawned rapala and the prosthetic limbs coming out blank white.
-Also snips out some irrelevant copypasta residue.
 2019-06-10 13:16:18 +03:00
Heroman
d6c295b226 Fixes geese escaping the wilderness 2019-06-10 17:32:13 +10:00
Neerti
4512cd7b18 Merge pull request #6200 from Heroman3003/xenoarch-fixes 
Fixes some xenoarch bugs
 2019-06-09 11:47:07 -04:00
Verkister
d3fad1a1e6 Brings back oties and adds riding. 
-Brings back oties. Currently adminspawn only though.
-Certain niche features still missing such as sec versions reacting to crime.
-Added red guard version.
-Tamed ones can still be befriended etc.
-Minor fixes to sprites and file naming.
-Adds riding to player controlled oties and corrupt hounds.
 2019-06-09 13:26:29 +03:00
Verkister
8d01927aa7 Engie dog fixes and tweaks. 
-Gives engie dog basic magnetic and circuit grippers.
-Fixes the decompiler halving the amount on ingested sheets.
-Doubles the nerfed matter reserve recharge rates and their starting amount.
 2019-06-09 11:54:19 +03:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Ketrai
cea411049a Adds a durasteel fishing rod. 2019-06-07 16:48:35 +02:00
Novacat
b9eaa4f7ec Merge pull request #5296 from Ketrai/fisherdomer 
Adds a fish farm.
 2019-06-06 15:49:43 -04:00
Novacat
3db0e6d4c2 Merge pull request #5302 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 15:37:00 -04:00