cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,090 Commits 5 Branches 0 Tags
edec960bda4dc5dd32b564858ee1a19307b64eaa
Commit Graph

20709 Commits

Author SHA1 Message Date
Arokha Sieyes
edec960bda Shelter sleeper description tweak 2018-04-29 21:03:29 -04:00
Aronai Sieyes
1849e1280e Merge pull request #3577 from Screemonster/willitblend 
Makes blenders multitoolable for grub larva
 2018-04-28 20:49:19 -04:00
Screemonster
a2329fb1b5 Xenochimera things I missed reviewing the cleanup 2018-04-28 22:32:11 +01:00
Screemonster
d4b800d263 does the thing more betterer 2018-04-28 21:02:34 +01:00
Spades
638a3f22d5 Merge pull request #3101 from VOREStation/aro-xen 
[Pls Review] Xenochimera Cleanup
 2018-04-28 10:48:19 -04:00
Arokha Sieyes
6f50bce4e7 Xenochimera refactoring 2018-04-27 20:04:59 -04:00
kcin2001
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
Aronai Sieyes
c93f0832ed Merge pull request #3559 from VOREStation/aro-sync-04252018 
Polaris Sync 04-25-2018
 2018-04-27 16:17:22 -04:00
Screemonster
6cebb30a16 Makes blenders multitoolable for grub larva 2018-04-27 08:57:25 +01:00
Verkister
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 Sieyes
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 Sieyes
6068c5ac5a Merge pull request #3562 from VOREStation/aro-portaconsole 
No more portable GPS console
 2018-04-26 02:04:24 -04: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
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
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 Sieyes
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 Sieyes
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
Atermonera
45284a6669 Merge pull request #5203 from Cerebulon/greenpumps 
Fixes pumpkins and watermelon sprites
 2018-04-25 12:01:42 -07:00
Aronai Sieyes
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
Atermonera
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
Cameron653
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 Sieyes
fa7ec1f488 Ports /tg/ fulton system 2018-04-24 12:59:26 -04:00
Arokha Sieyes
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
Atermonera
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 Sieyes
4cab59e28a Merge pull request #3546 from VOREStation/aro-shelters2 
Port /tg/ lavaland shelters
 2018-04-23 17:35:46 -04:00
Cameron653
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 Sieyes
a53e7b534c Merge pull request #3528 from Verkister/patch-20 
Metabolism trait adjustments.
 2018-04-23 16:34:01 -04:00
Aronai Sieyes
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 Sieyes
392de060f9 Merge pull request #3545 from HzDonut/master 
Final LeMat Fix
 2018-04-23 15:21:41 -04:00
Aronai Sieyes
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
Leshana
2a4182cc8e First effort fix of the slimes integration with taur riding. 2018-04-22 15:24:48 -04:00
Anewbe
b4e59c3949 Merge pull request #5198 from Cameron653/patch-1 
Makes clothing use the correct sprite sheet.
 2018-04-22 11:53:40 -05:00
Leshana
8ac6b0bfe9 Fix Scree and Scree Accessories 2018-04-21 23:22:08 -04:00
Heroman3003
dcbf8627ef Fixed size-affecting reagents not working when ingested 2018-04-22 08:16:09 +10:00
Anewbe
5cfb443cce Communicator visibility is now on a per-character basis, rather than global 2018-04-21 17:08:39 -05:00
Verkister
4c78ed0183 Metabolism trait adjustments. 
-Adjusts the metabolism traits some more to get them in line with some sort of numerical logic with better documentation.
-Slow metabolism is now -20% of default on every field.
-Fast metabolism now gives +20% processing rate and hunger/WG are both scaled to Teshari level (4x default)
-Apex metabolism stats now scaled to double the fast metabolism (+40%, 8x, still lower than pre-nerf). Also returns consistency with apex hunger/WG ratio that got bloopered in the lazy nerf. (gains left way too fast compared to hunger nerf. Gael just gained almost 5 pounds within overeat duration of like 10~15min lmao)
 2018-04-21 13:26:10 +03:00