cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 15:36:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,492 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-8
Commit Graph
20901 Commits
Author SHA1 Message Date
ReddeyfishVorandGitHub f8b6752121 Prevent negative weight events from occuring 2018-04-27 17:09:48 -07:00
Arokha Sieyes 6f50bce4e7 Xenochimera refactoring 2018-04-27 20:04:59 -04:00
kcin2001andGitHub 0b4507f333 Merge branch 'master' into herms 2018-04-27 17:00:09 -07:00
kcin2001 4bb676b317 fixes gender_vr 2018-04-27 15:58:10 -07:00
kcin2001 51cd8636be Adding herms all the way 2018-04-27 15:53:37 -07:00
Verkister d7dde633ce Adds a funky fresh feature to beartraps. 
-Beartraps can now be worn on mask slot.
-Wearing them on mask slot enables brutal predation for the wearer.
 2018-04-28 00:24:13 +03:00
Aronai SieyesandGitHub c93f0832ed Merge pull request #3559 from VOREStation/aro-sync-04252018 
Polaris Sync 04-25-2018
 2018-04-27 16:17:22 -04:00
AtermoneraandGitHub c8d2f47f06 Merge pull request #5210 from VOREStation/pol-circuitexp 
Fixes an exploit with circuit printers
 2018-04-27 11:12:46 -07:00
Mewchild 78efe65c1c Fixes miners not being able to take supply snowsuit 2018-04-27 12:12:24 -05:00
Leshana f8b2d3e4d6 Alternative way to avoid tooltips on mimics. 2018-04-27 09:49:02 -04:00
Leshana d05163baba Fix missing descriptions on guns. 
examine() is supposed to return a value, these ones did not.
 2018-04-27 09:48:43 -04:00
Arokha SieyesandLeshana 3b4b9ea988 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-27 09:48:27 -04:00
Screemonster 6cebb30a16 Makes blenders multitoolable for grub larva 2018-04-27 08:57:25 +01:00
Verkister 733c21944f Adds glowy eyes to badbois and sec/phoron oties. 
-Not glowing when resting though because of reasons.
 2018-04-26 23:22:53 +03:00
VerkisterandGitHub 5e1f0d6dcf Slightly softer corrupt pups. 
-Halved pounce chance and reduced mauling damage scaling by 5.
-Slightly reduced chatspam chance.
-Buffed the pounce chance for the extra special double corrupt prettybois though. Also gave their punts more flavor.
 2018-04-26 15:23:36 +03:00
Aronai SieyesandGitHub 0d24c886cd Merge pull request #3563 from VOREStation/vplk-fix-gun-examine 
Fix missing descriptions on guns.
 2018-04-26 02:04:32 -04:00
Aronai SieyesandGitHub 6068c5ac5a Merge pull request #3562 from VOREStation/aro-portaconsole 
No more portable GPS console
 2018-04-26 02:04:24 -04:00
Woodratt c32bcf785a PoI Stage 0.5 
Doing this in smaller bits

- New random sif mob selector, peaceful animals
- Drone lootpile (basic placeholder loot right now until we figure out how to give them proper drone loot)
- New random spider mob selector, nurse spider and nurse hat spider (hat spider has 10 more health points and is a rare chance to spawn, woo)
- New spacesuit random spawn, medical space suits
- New Random Shotgun spawn
- New random gun spawns
- Fixed icon for random medicine spawn
- Fixed broken icon for 44 magazines
- Fixed Ice Cave dungeon walls being called 'steel'
- Added new Crystal type, to avoid the SM style crystal from spawning in crystal PoIs
 2018-04-25 22:11:30 -07:00
Leshana 32416bc2b6 Fix missing descriptions on guns. 
examine() is supposed to return a value, these ones did not.
 2018-04-25 22:16:28 -04:00
Arokha Sieyes d19e68ba55 No more portable GPS console 2018-04-25 22:16:13 -04:00
Anewbe 9e4a625f18 Hides jobs with the Never pref on late join 2018-04-25 20:28:42 -05:00
Arokha Sieyes cb7e0de2e4 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-25 20:49:45 -04:00
Arokha Sieyes 3f6ed1cea7 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-25 20:47:17 -04:00
Arokha Sieyes 6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Aronai SieyesandGitHub 9257743854 Merge pull request #3555 from VOREStation/vplk-mining-enhance 
Ports /tg/ and/or Paradise ORM, + The Underdark
 2018-04-25 17:03:42 -04:00
Aronai SieyesandAtermonera a849010ab1 Makes organ removal/attachment right again (#5192) 
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
 2018-04-25 12:03:10 -07:00
AtermoneraandGitHub 45284a6669 Merge pull request #5203 from Cerebulon/greenpumps 
Fixes pumpkins and watermelon sprites
 2018-04-25 12:01:42 -07:00
Aronai SieyesandGitHub bba149737f Merge pull request #3527 from kcin2001/spirit-markings 
Adds in Spirit markings (that should work this time)
 2018-04-25 10:53:19 -04:00
AtermoneraandGitHub 7d6fba3ba1 Merge pull request #5194 from Anewbe/species_economic 
Species economic modifier is now a species var
 2018-04-24 23:26:41 -07:00
Leshana c09412c33e Implements the Mining Equipment Vendor 
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
 2018-04-24 18:18:54 -04:00
Cameron653andGitHub 5ecdf703d3 Merge pull request #3548 from Cameron653/TESHARI_FBP 
Adds missing Teshari DSI
 2018-04-24 16:40:17 -04:00
Leshana d1cfda7048 Added jump boots and gryphon boots. 
Jump boots let you throw yourself forwards!  Gryphon boots just look like gryphon foots.
 2018-04-24 12:59:29 -04:00
Arokha SieyesandLeshana fa7ec1f488 Ports /tg/ fulton system 2018-04-24 12:59:26 -04:00
Arokha SieyesandLeshana fb23176220 Adds a baby translocator for miners 2018-04-24 12:59:24 -04:00
Leshana 43b8c1720c Adds the Kinetic Accelerator 
A mining gun, this upgradable energy weapon can mine mineral turfs at a distance.  It does only 25% of nominal damage when fired indoors.
It can be upgraded with modkits, giving it range, pretty colors, aoe against minerals or mobs.
 2018-04-24 12:59:23 -04:00
Leshana 051384ee22 Adds the Resonator 
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside.  Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons.  Includes sound effects
Ported from tg and Paradise
 2018-04-24 12:57:50 -04:00
Leshana 5c6d6a5d20 POLARIS: Cleanup mineral processing unit 
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
 2018-04-24 12:57:49 -04:00
Cameron653 d9be096edb Fixes tesh being able to use all prosthetics 
Thanks to Aronai for the solution
 2018-04-23 23:03:00 -04:00
AtermoneraandGitHub 1fc11fe8c5 Merge pull request #5187 from Anewbe/comms_tweak 
Communicator visibility is now on a per-character basis, rather than global
 2018-04-23 18:59:00 -07:00
Aronai SieyesandGitHub 4cab59e28a Merge pull request #3546 from VOREStation/aro-shelters2 
Port /tg/ lavaland shelters
 2018-04-23 17:35:46 -04:00
Cameron653andGitHub a6b25bc79a whoops 
Credit to Nestor for doing the original coding, however.
 2018-04-23 17:00:32 -04:00
Cameron653 aa97863a73 Ever hit the "push" button and then realize "Oh shit I forgot something"? 2018-04-23 16:54:22 -04:00
Cameron653 6c75c72dd2 Adds missing Teshari DSI 
https://i.imgur.com/UmrLEDT.png - (White)
https://i.imgur.com/vXGIFi3.png - (Light Blue)
https://i.imgur.com/H8NFgTD.png (Light Pink)
Operates the same as every other DSI.
 2018-04-23 16:51:37 -04:00
Aronai SieyesandGitHub a53e7b534c Merge pull request #3528 from Verkister/patch-20 
Metabolism trait adjustments.
 2018-04-23 16:34:01 -04:00
Aronai SieyesandGitHub 5e7a397e68 Merge pull request #3542 from VOREStation/vplk-slime-buckle-attack-fix 
First effort fix of the slimes integration with taur riding.
 2018-04-23 16:33:22 -04:00
Arokha Sieyes cd865a176b Fix a table sprite and a shelter window layer 2018-04-23 15:44:13 -04:00
Arokha Sieyes d5c9d3cb4e Port /tg/ lavaland shelters 
Nanotech twist rather than bluespace, but whatever.
 2018-04-23 15:25:35 -04:00
Aronai SieyesandGitHub 392de060f9 Merge pull request #3545 from HzDonut/master 
Final LeMat Fix
 2018-04-23 15:21:41 -04:00
Aronai SieyesandGitHub 15d590a967 Merge pull request #3537 from VOREStation/vplk-xenochimera-base 
Fix Scree and Scree Accessories
 2018-04-23 15:15:08 -04:00
HzDonut 980c9bea44 LeMat Fix 
Argh
 2018-04-23 09:28:33 -04:00