cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,663 Commits 9 Branches 26 Tags
f3f4b945bbbb348c0d44b5ee9a0574f6dfbcedde
Commit Graph

8699 Commits

Author SHA1 Message Date
Arokha Sieyes
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 Sieyes
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 Sieyes
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 Sieyes
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
Verkister
f15b01a8e1 Squashed commit of the following: 
commit 95d6df8b82
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 c004b9aae0
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Jan 11 08:55:34 2018 +0200

    Update dog_sleeper_vr.dm

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

    Update dog_sleeper_vr.dm

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

    Update dog_sleeper_vr.dm

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

    Tested fixed

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

    whooBs

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

    Update dog_sleeper_vr.dm

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

    Update dog_sleeper_vr.dm

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

    Sync button only shows up when appropriate

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

    no large items into analyzer noms

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

    Update dog_sleeper_vr.dm

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

    Update dog_sleeper_vr.dm

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

    Update dog_sleeper_vr.dm

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

    scan after nom

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

    Update dog_sleeper_vr.dm

commit 2670ec54b7
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 Sieyes
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 Sieyes
8c6da18e19 Merge pull request #2754 from VOREStation/aro-colorblind 
Colorblindness Traits
 2018-01-16 02:46:10 -05:00
Arokha Sieyes
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 Sieyes
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
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -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 Sieyes
149b582f66 Merge pull request #2727 from Suhayll/master 
Add New Dogborg model for Sec
 2018-01-14 00:17:08 -05:00
Arokha Sieyes
8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon 
Refactor Digestion
 2018-01-14 00:07:54 -05:00
Valekin
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
Cameron653
47671eded6 Gives them the loader like the sciborg 2018-01-09 22:16:51 -05:00
Arokha Sieyes
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 Sieyes
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
Verkister
d8f3a7d972 Updates science borgo for the updated icon stuff 
dogborg is true
 2018-01-08 17:01:09 +02:00
Cyantime
46c99cca03 Improves medibot speaker switch 2018-01-07 22:09:43 -05:00
Arokha Sieyes
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
Arokha Sieyes
7dd9bd3e55 New Science Dogborg 2018-01-07 00:05:10 -05:00
Cyantime
af8cec54ab Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506) 
* Fixes gravekeeper module wood synth, fixes typo

* Gives the grave gripper a name
 2018-01-06 20:20:01 -06:00
Cyantime
ebb8d287cf Returns noodle to the CE's office 2018-01-05 22:56:33 -05:00
Leshana
6b87ecd2b8 Merge pull request #2685 from VOREStation/aro-lessmagic 
Tweak lethal succubus drain
 2018-01-05 14:22:39 -05:00
Anewbe
2b2a5dc565 Merge pull request #4503 from Neerti/1/1/2018_bonfires 
Adds Bonfires
 2018-01-05 13:36:19 -05:00
Arokha Sieyes
1110d6cf82 Tweak lethal succubus drain 
Mostly remove the OOC magic-implying wording about 'life energy' (since setting is w/o magic) so it can be whatever in your private RPs (someone was asking about using it to represent stealing bodyheat which is cool).
`absorbing_prey` was never unset if they were found to be indigestible, so fixed that
Two stages also sent two messages at the same time
Removed the needless casting of src to C since it's defined on human already

Maybe in the future consider using cloneloss instead of brainloss? Alkysine is one of the easiest drugs to make, and if I jack myself up with it I'd maybe be immune to having my nutrition/heat/whatever stolen which seems ~unusual~
 2018-01-05 10:59:20 -05:00
Arokha Sieyes
ce0b3e9678 Merge pull request #2664 from Verkister/buppers 
Fixes non-dogborgs butting into dogborg icon update territory.
 2018-01-05 10:11:13 -05:00