cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-20 11:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,918 Commits 11 Branches 0 Tags
393673baa43da1e36b37b7d192617841e95b31fa
Commit Graph
8756 Commits
Author SHA1 Message Date
Arokha SieyesandGitHub 0df3060a3e Merge pull request #2762 from Verkister/squashbelly 
Fixes science borg analyzer belly and couple other things. (*squish edition)
 2018-01-16 23:47:17 -05:00
Arokha SieyesandGitHub 79406b254d Merge pull request #2770 from VOREStation/vplk-ghostfix 
POLARIS: Fix regular mobs seeing when ghosts point at things.
 2018-01-16 23:44:19 -05:00
Leshana afd37c32db POLARIS: Fix regular mobs seeing when ghosts point at things. 
* Fixed it by adding a facility by which code can check if a mob can logically see things present on another plane.
 2018-01-16 20:04:57 -05:00
Arokha Sieyes b6c3162a15 Clean up how NIFs are implemented 
Simplify how these work a bit, and fix the goggle-alike NIFsofts while I'm at it.
 2018-01-16 17:12:24 -05:00
Arokha SieyesandGitHub ce46a0a14b Merge pull request #2759 from VOREStation/aro-ghostbusting 
Prevent certain things from including spooky ghosts
 2018-01-16 13:53:26 -05:00
Arokha SieyesandGitHub a724de287d Merge pull request #2756 from VOREStation/aro-borgexamine 
Remove HUD items from borg modules on all borgs
 2018-01-16 13:43:28 -05:00
VerkisterandGitHub 1899adef2c Removes redundant baton charging from sec borg. 
The baton uses the borg's own cell.
 2018-01-16 13:47:27 +02:00
Verkister f15b01a8e1 Squashed commit of the following: 
commit 95d6df8b82416bfb8a4b5ec742f211664be5e082
Merge: c004b9aae0 9a56c27c9f
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Jan 14 09:11:42 2018 +0200

    Merge branch 'master' of https://github.com/VOREStation/VOREStation into nerdbelly

    # Conflicts:
    #	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

commit c004b9aae077a98a405fa6bf770c4622a4be85c6
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Jan 11 08:55:34 2018 +0200

    Update dog_sleeper_vr.dm

commit ce6d51e353e9c0d70f4a3dcdf228e2714b1a373f
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Jan 11 08:29:59 2018 +0200

    Update dog_sleeper_vr.dm

commit d0f368dc5a5b628c5df753f7e969027733de0f6f
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:35:08 2018 +0200

    Update dog_sleeper_vr.dm

commit c97e426c8774390f2d82c52813faf1f2245a636b
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:24:00 2018 +0200

    Tested fixed

commit 7de1d5bcb704583f5dec062df757e9a4e9269732
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:05:55 2018 +0200

    whooBs

commit 889fd4454266731ed7c816e997ddc5e3f98d8210
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:03:56 2018 +0200

    Update dog_sleeper_vr.dm

commit ccbd9513fb6ea841fb79e048364cac6c8143c621
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:02:15 2018 +0200

    Update dog_sleeper_vr.dm

commit 8651bf40fc844b332741aa4224f15c6fdc28e1dc
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:54:20 2018 +0200

    Sync button only shows up when appropriate

commit 5030c0326ddfe7635866b68bd3b9d102d2e2a1f2
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:27:49 2018 +0200

    no large items into analyzer noms

commit ad8c437fff5e193f9a2229fcc024969199ac2a7a
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:18:17 2018 +0200

    Update dog_sleeper_vr.dm

commit 18dc5fdc1b025719f0cd802573c4872f35fa1045
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:13:26 2018 +0200

    Update dog_sleeper_vr.dm

commit 4f21d4597f768c471f8031232c17eb696ce1d956
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:08:00 2018 +0200

    Update dog_sleeper_vr.dm

commit 9f19e1ac117b0d434e6f2a03f0a8fcb38ca296bb
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 13:10:57 2018 +0200

    scan after nom

commit c82ba8078fddb9ee4c99a0ee6b65ec68f0ad9ba8
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 12:59:42 2018 +0200

    Update dog_sleeper_vr.dm

commit 2670ec54b78186892ac6fcdb55e6613ee7a5dcc7
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 12:32:41 2018 +0200

    Fixes science borg analyzer belly and couple other things.
    -Digestive Analyzer belly now works as intended.
    -It now tells the item's research value on nom and updates internal files on gurgles. Sync button is in the sleeper UI for the belly.
    -Fixed UI refreshing on all borg sleeper bellies.
    -Updated the entire sleeper code to use to_chat.
 2018-01-16 10:50:16 +02:00
Arokha SieyesandGitHub 0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10 
Polaris Sync 2018 01 10
 2018-01-16 02:46:25 -05:00
Arokha SieyesandGitHub 8c6da18e19 Merge pull request #2754 from VOREStation/aro-colorblind 
Colorblindness Traits
 2018-01-16 02:46:10 -05:00
Arokha SieyesandGitHub 2b8063418a Merge pull request #2758 from VOREStation/aro-updateicons 
3000% human/update_icons() speed improvement
 2018-01-16 02:44:30 -05:00
Arokha Sieyes 10aabd98da POLARIS: 3000% human/update_icons() improvement 
Using overlays in lists and a mutable_appearance
 2018-01-15 21:39:47 -05:00
Arokha Sieyes 840f39cb7e Cleanup implementation of some traits 
Better implemented this way rather than with snowflake species vars (which are getting wiped on synths, so synths end up not being able to use these sometimes)
 2018-01-15 21:34:08 -05:00
Arokha Sieyes f2b83eb7da Prevent certain things from including spooky ghosts 
I mean I like soulvore but c'mon.
 2018-01-15 20:38:28 -05:00
Arokha Sieyes d3d1ed971e VS: Remove the HUD items from dogborgs 2018-01-15 13:30:56 -05:00
Arokha Sieyes 58720bfe4d POLARIS: Remove the need for borgs to have HUD items in their module inventory 2018-01-15 13:30:37 -05:00
Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
 2018-01-15 13:27:39 -05:00
Arokha Sieyes 737793c854 VS: Colorblindness traits 2018-01-15 03:31:58 -05:00
Arokha Sieyes 546f71d3fd POLARIS: Adds a 'alter values' proc for plane master ease of tweaking 
Setting stuff like colorblindness variety and things.
 2018-01-15 03:31:38 -05:00
Arokha SieyesandGitHub 93564bc90e Merge pull request #2751 from VOREStation/aro-altghosts 
POLARIS: Hide higher planes from alt-turf menu
 2018-01-14 22:48:51 -05:00
Arokha Sieyes 73d91610f0 POLARIS: Hide higher planes from alt-turf menu 
Hides things from higher planes in the alt-examine menu. Too spooky! Fixes #2749
 2018-01-14 22:22:20 -05:00
Arokha Sieyes 1b180a8fd3 POLARIS: The return of the material scanner overlay 2018-01-14 19:26:54 -05:00
Arokha Sieyes bd5856adf0 POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT 2018-01-14 19:26:07 -05:00
NeertiandAnewbe 96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527) 
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
 2018-01-14 14:58:15 -06:00
Arokha SieyesandGitHub 60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -05:00
NeertiandGitHub 20062a5fd2 Merge pull request #4528 from Atermonera/int_gps 
Adds gps units to borgs
 2018-01-14 11:53:09 -05:00
Arokha Sieyes 8f71a052a4 VS: Planes shenanigans. Begins 'plane' work, for VS specific things. 2018-01-14 00:40:00 -05:00
Arokha Sieyes ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha SieyesandGitHub 149b582f66 Merge pull request #2727 from Suhayll/master 
Add New Dogborg model for Sec
 2018-01-14 00:17:08 -05:00
Arokha SieyesandGitHub 8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon 
Refactor Digestion
 2018-01-14 00:07:54 -05:00
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
atermonera 511f0a344b Adds gps units to borgs 2018-01-12 19:57:06 -08:00
AnewbeandGitHub 4c17f28cd0 Merge pull request #4519 from Neerti/12/15/2017_berserking 
Adds Berserk
 2018-01-11 20:57:50 -06:00
Neerti cca2cc5a23 Adds Berserk 2018-01-11 01:35:14 -05:00
ValekinandGitHub faa22ceb3d Update station_vr.dm 2018-01-11 02:48:47 +02:00
Arokha Sieyes 072a40dea3 Make digest_act even more generic (and contaminate) 
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
 2018-01-10 10:02:13 -05:00
Arokha Sieyes 449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Mechoid 34f2fb2f42 Adds NO_INFECT to the base Xeno species. 2018-01-09 20:18:58 -08:00
Cameron653andGitHub 47671eded6 Gives them the loader like the sciborg 2018-01-09 22:16:51 -05:00
Arokha SieyesandGitHub 05864e06ea Merge pull request #2719 from VOREStation/aro-layer 
Make laying people be under other people
 2018-01-09 20:33:54 -05:00
Arokha SieyesandGitHub 68e7efa2b2 Merge pull request #2718 from Cyantime/boxfix 
Actually fixes snakesnack box
 2018-01-09 20:25:16 -05:00
Cyantime be875510f3 Actually fixes snakesnack box 2018-01-09 18:51:14 -05:00
Arokha Sieyes 0bee7979d9 Make laying people be under other people 
Unsure what consequences this would have. PLEASE REVIEW. (It works fine ingame, but I can't test every object with every mob)
 2018-01-09 18:16:17 -05:00
Cyantime 81937179ec Fix snakesnack box 2018-01-09 18:06:03 -05:00
Mechoid 91be171f62 Adds a species flag for preventing infections, akin to IS_PLANT, without its other traits. 2018-01-09 12:42:20 -08:00
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
 2018-01-09 14:40:09 -05:00
VerkisterandGitHub d8f3a7d972 Updates science borgo for the updated icon stuff 
dogborg is true
 2018-01-08 17:01:09 +02:00
CyantimeandGitHub 46c99cca03 Improves medibot speaker switch 2018-01-07 22:09:43 -05:00
Arokha SieyesandGitHub 080a9234d6 Merge pull request #2699 from kcin2001/scidog 
adds i new science dogborg and 2 dogborg reskins
 2018-01-07 21:35:55 -05:00
Cyantime 6e50929df5 Fixes 2018-01-07 12:56:07 -05:00