cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,496 Commits 9 Branches 0 Tags
7bd32b056d72d90d7b03f57147ce6c3da20bf1fe
Commit Graph

29915 Commits

Author SHA1 Message Date
Arokha Sieyes
7bd32b056d Merge pull request #2676 from Screemonster/bellybugs 
Fixes some bugs relating to absorption and struggling, makes struggle feedback messages clearer
 2018-01-05 10:10:46 -05:00
Arokha Sieyes
5a81cbefba Merge pull request #2671 from blazerules/master 
Electrostaff Custom Item
 2018-01-05 10:08:32 -05:00
Arokha Sieyes
82f373aa1e Merge pull request #2672 from Cameron653/EMERGENCY 
January Sync
 2018-01-05 10:04:41 -05:00
Leshana
968697d02e Replaced world.tick_usage with TICK_USAGE macro in VOREStation code 2018-01-04 22:57:00 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Screemonster
9f15ee88a0 Adds vore panel preference to enable/disable being eaten by mobs 2018-01-05 02:53:13 +00:00
Screemonster
3090acdceb does the absorb-release-thing more betterer 2018-01-05 01:08:22 +00:00
Screemonster
a0b02b57c1 fixes some bugs in absorption and struggling 2018-01-04 23:49:06 +00:00
Neerti
250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
Neerti
58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why 
Fixes Exploit with Power Tools
 2018-01-03 15:50:02 -05:00
Neerti
5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
blazerules
77080534a6 Electrostaff Custom Item 
Please kill me I am bad at noticing small things.
 2018-01-03 11:08:25 +02:00
blazerules
43108a5dab Electrostaff Custom Item 
Fixed typos
 2018-01-03 10:57:31 +02:00
blazerules
07b0b071ce Electrostaff Custom Item 
Changes as asked for by Arokha
 2018-01-03 10:07:52 +02:00
blazerules
2d434c40d5 Electrostaff Custom Item 
This is the code for the stunstaff as was approved here

https://forum.vore-station.net/viewtopic.php?f=27&t=1204
 2018-01-03 09:28:43 +02:00
Neerti
9ab7c0bf0c Merge pull request #4470 from VOREStation/vplk-ss-machines 
Convert machinery controller to StonedMC subsystem
 2018-01-02 23:21:47 -05:00
Neerti
d7b5cca562 Merge pull request #4496 from Atermonera/admin_dsay 
Admins can see dsay again
 2018-01-02 23:20:39 -05:00
Atermonera
3210625822 Admins can see dsay again 2018-01-02 17:11:50 -08:00
Anewbe
d1422641bf Merge pull request #4475 from Neerti/12/31/2017 
Adds Visual Cleavage
 2018-01-02 20:04:50 -05:00
Atermonera
c9941e2450 S&R loadout spacing (#4486) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* S&R is inline w/ explorer roles in char setup
 2018-01-02 20:04:32 -05:00
Anewbe
929fd91f34 Merge pull request #4478 from Cyantime/patch-1 
Makes cloners actually only take meat for biomass when autoprocessing
 2018-01-02 20:04:21 -05:00
Anewbe
2f84a7dc95 Merge pull request #4489 from VOREStation/qdel-hints-gen5 
Additional Destroy proc fixes
 2018-01-02 20:04:02 -05:00
Anewbe
f46dabddc0 Merge pull request #4494 from VOREStation/vplk-small-fixes 
Fix runtimes in MouseDrop when dragging out of the screen
 2018-01-02 20:03:47 -05:00
Anewbe
ae5bc40a53 Merge pull request #4483 from Verkister/smoothlimbs 
Eliminates one possible culprit behind dismemberment crashes.
 2018-01-02 20:02:48 -05:00
Anewbe
1f22838bcc Merge pull request #4482 from Neerti/1/1/2018_rainbow_slime_fix 
Rainbow Slime Extracts No Longer Make Wild Slimes
 2018-01-02 20:01:38 -05:00
Anewbe
cc6aba9265 Merge pull request #4481 from Neerti/1/1/2018_meteor_fix 
Meteors Will Not Explode the Surface
 2018-01-02 20:01:20 -05:00
Anewbe
7ec8c9614f Merge pull request #4479 from Neerti/1/1/2018_handtele_fix 
Removes Hardcoded Z-check on Handteles
 2018-01-02 20:01:09 -05:00
Arokha Sieyes
2bcee3d20a Merge pull request #2666 from Verkister/OwO 
Makes belly bulge examine add up prey sizes.
 2018-01-02 16:23:26 -05:00
Arokha Sieyes
e76732c0e5 Merge pull request #2662 from VOREStation/aro-farmbotsan 
Destroys botany forever
 2018-01-02 16:23:14 -05:00
Verkister
022e3cf63b Update belly_vr.dm 2018-01-02 23:08:27 +02:00
Arokha Sieyes
c8af737592 Merge pull request #2665 from Verkister/emptyguts 
Fixes bugs related to picking shit from empty belly content lists.
 2018-01-02 16:06:59 -05:00
Arokha Sieyes
f7f4a15c50 Destroys botany forever 
Why do we have a robot that literally does the entire job. Basically people leave it and it becomes a lag generator forever. Removes farmbot harvesting and removal of dead plants, plus adds an idle timer for 150 process cycles without a target causing it to turn itself off. So basically it will tend the plants and keep them alive, but you need to come harvest them sometimes.
 2018-01-02 16:06:13 -05:00
Arokha Sieyes
51d90b3c76 Merge pull request #2661 from VOREStation/aro-shipwork 
Redoes the small cruiser
 2018-01-02 15:57:29 -05:00
Leshana
cc3397c4fa Fixes "was unable to be GC'd" when deleting tanks. 2018-01-02 13:13:49 -05:00
Verkister
899d7c0b2b Makes belly bulge examine add up prey sizes. 
-If prey 1 is too small to show up, ya get no visible bulge.
-But if you eat another prey also too small to show up, but take enough space together with the first one, ya get bulge.
-Also if you eat a small person, and then a big person, ya now get bulge too. (unlike before)

OwO
 2018-01-02 19:03:47 +02:00
Verkister
11a8ea16ef Fixes bugs related to picking shit from empty belly content lists. 
-Makes digestion modes "finish" once everything unprotected is gone.
-This also means your guts will no longer permagurgle fruitlessly while nothing but a shitty ID in there.
 2018-01-02 18:27:44 +02:00
Neerti
259b0a6702 Merge pull request #4465 from VOREStation/pol-railguns 
Tweak out-of-ammo behavior on railguns
 2018-01-02 03:19:23 -05:00
Arokha Sieyes
3cb0dc8ddb Redoes the small cruiser 
On the ships map, the little one that was in the top left. Am I the only admin who's ever used the admin lewdship in our maps? This one is too big to fit at the station so it has a little shuttle. Maximum class, for hosting parties.

While editing the docking thing for the shuttle, also fixes the tether 'goodluckmcgee' shuttle docking at the station. Now it docks properly and the doors open like one might expect.
 2018-01-02 03:17:48 -05:00
Neerti
0a147678e5 Merge pull request #4477 from Cyantime/mechpipe 
Bars mechs from entering disposal chutes.
 2018-01-02 03:16:50 -05:00
Neerti
91a7db2d53 Merge pull request #4488 from SpadesNeil/autolathe-name-fix 
Fixes shotgun speedloaders in Autolathe
 2018-01-02 03:13:38 -05:00
Neerti
a65074e231 Merge pull request #4490 from Cyantime/patch-4 
Fixes flashlight eye exams
 2018-01-02 03:13:21 -05:00
Arokha Sieyes
ca9b36e6b1 Merge pull request #2651 from VOREStation/Cameron653-patch-2 
Makes the soulcatcher able to have 2048 characters
 2018-01-02 02:45:47 -05:00
Arokha Sieyes
2ad006c3b2 Merge pull request #2652 from VOREStation/Cameron653-patch-3 
Swaps two words around.
 2018-01-02 02:45:28 -05:00
Arokha Sieyes
63dd746cca Merge pull request #2659 from Cyantime/resleevehealth 
Prevents low health bodies from dying on creation
 2018-01-02 02:45:16 -05:00
Neerti
7b303d70db Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""""" (#4491) 2018-01-01 23:36:36 -08:00
Anewbe
588dbdb4fb Merge pull request #4476 from Neerti/12/31/2017_cache_tweak 
Tweaks cache_lifespan
 2018-01-01 23:18:13 -05:00
Neerti
495f985022 Travis Appeasement Mark II (#4485) 
* Tries to Please Travis
Should remove all active edge problems.
Moves map-specific unit tests to the map define file.
Enhances some PoIs in terms of adding /ignore_mapgen to the ground.
Fixes incorrect loot pile in one PoI.

* Conflicts are fun.

* Might fix unit test.
 2018-01-01 22:26:31 -05:00
Cyantime
496f6368fb Fixes flashlight eye exams 2018-01-01 21:23:45 -05:00
Spades
581f175c27 Fixes shotgun speedloaders in Autolathe 
The name was just wrong. Fixed it.
 2018-01-01 17:54:49 -05:00
MarinaGryphon
3f98312535 Ports hoists, as well as some macros, from Aurorastation. (#4451) 
* Ports hoists.

* Ports use_check
 2018-01-01 12:17:35 -08:00