cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,747 Commits 9 Branches 26 Tags
30790f2bd5fe2d446c2fd18cd4a7cc8b87186152
Commit Graph

8713 Commits

Author SHA1 Message Date
Arokha Sieyes
508ea0d6a3 Merge pull request #2775 from VOREStation/syncomatic 
Polaris Sync
 2018-01-17 18:36:35 -05:00
Arokha Sieyes
c0e4109cb2 Merge pull request #2767 from VOREStation/arovplk-tether-dedep 
Fix dependencies on tether map in main codebase
 2018-01-17 18:07:43 -05:00
Arokha Sieyes
6b2f4c6146 Fix update_icons() on human update_transform() and effects.dmi unnamed state 2018-01-17 17:58:11 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map. 
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
 2018-01-17 15:23:22 -05:00
Abbie Fland
c2d294ac74 Prevent stalls in dogborg self-clean cycle 
When something unexpected (such as mice, which are neither humans nor
items) is in a scrubpup's garbage compactor, it could stall forever when
performing a self-clean. This changes it to treat anything it doesn't
know how to digest as an indigestible item, treating it like other
indigestible items such as ID cards.

This also changes the self-clean damage ticks to harm anything living,
rather than just human.
 2018-01-17 20:01:14 +00:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545) 
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
 2018-01-17 13:45:54 -06:00
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
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 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
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527) 
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
 2018-01-14 14:58:15 -06:00
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -05:00
Neerti
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 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
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
Anewbe
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
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