cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,903 Commits 7 Branches 0 Tags
947a59e926f20700b6dbf12516401cb15bb1bc87
Commit Graph

19461 Commits

Author SHA1 Message Date
Neerti
5b54f4c875 Surface Map Work (#4557) 
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
 2018-01-17 13:46:19 -06: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
Neerti
d2f3ca0a74 Fixes Blob Tasering 
Blobs are no longer harmed by tasers or other strange weapons that don't damage structures.
 2018-01-17 14:19:40 -05:00
Leshana
62ef3b1820 Make the Metor Strike random event be configurable per map. 
* Added a variable to configure which areas are vulnerable to meteor strikes instead of hard coding it.
 2018-01-17 11:04:20 -05:00
SunnyDaise
a0bd8f6915 Adds Apple Juice. 2018-01-17 07:29:40 +00:00
Arokha Sieyes
e3d965c423 POLARIS: zshadow del fix 2018-01-17 02:18:50 -05:00
Arokha Sieyes
f3f4b945bb Merge pull request #2772 from VOREStation/aro-shadowdel 
Zshadow del fix
 2018-01-17 00:41:45 -05:00
Leshana
9456969a8e Make the persistence of spawn-points at end of be configurable per map. 
* Added three vars to the map datum to confgure which spawn point should be persisted for players who are dead, evac'd or stayed on station.
 2018-01-17 00:31:04 -05: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
ad5ab9d4a8 Merge pull request #2771 from VOREStation/aro-rigboot 
RIG Boot sequence
 2018-01-16 23:44:38 -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
Arokha Sieyes
5b4e48ca3a Merge pull request #2769 from AbbieFland/engi-vision 
Changes AR-E glasses to show engineering alarms
 2018-01-16 23:44:09 -05:00
Arokha Sieyes
bcd71c44c4 POLARIS: zshadow del fix 2018-01-16 23:42:16 -05:00
Arokha Sieyes
e72bf9ef43 POLARIS: RIG Boot sequence 
For fun! No mechanics changed, just looks neat.
 2018-01-16 23:15:26 -05:00
Atermonera
775559357f Fixes runtime in seed_packets.dm (#4549) 
* Fixes runtime in seed_packets.dm

* Moves sleeps to initialize()

* No more sleep
 2018-01-16 21:07:38 -06:00
atermonera
7f43737a53 Locket desc was too long 2018-01-16 18:48:32 -08: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
Abbie Fland
59fe79961d Changes AR-E glasses to show engineering alarms 
They were linked to the base alarm_monitor, which meant they got a blank
alarm panel.

This changes them to use alarm_monitor/engineering which has the
atmos/fire/power alarms common to engineering.
 2018-01-16 18:54:04 -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
Anewbe
3aef4a052b Merge pull request #4551 from Atermonera/shuttle_radio_announce 
Shuttles can announce over radio too!
 2018-01-16 15:26:57 -06: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 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 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
atermonera
caf3735500 Shuttles can announce over radio too! 2018-01-15 17:00:03 -08: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
Anewbe
d33e5a1304 Merge pull request #4542 from Stevenator1/MagnetsHowDoTheyWork 
Fix uses of TECH_MAGNETS to TECH_MAGNET
 2018-01-15 11:15:27 -06:00
Anewbe
829cd092c8 Merge pull request #4534 from Neerti/1/14/2018_autopilot_and_other_shuttle_stuff 
Web Shuttle Update
 2018-01-15 11:15:02 -06: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
Stevenator1
cd59a2e928 Fix uses of TECH_MAGNETS to TECH_MAGNET 2018-01-15 03:27:26 -05:00
Arokha Sieyes
9041853e33 Merge pull request #2753 from VOREStation/vplk-fix-photo-planes 
POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.
 2018-01-14 23:20:36 -05:00
Leshana
83562acf66 POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays. 2018-01-14 23:00:10 -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
ac5a41a48f POLARIS: Industrial suit material scanner 2018-01-14 20:21:53 -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
Anewbe
14f0060f28 Merge pull request #4531 from VOREStation/vplk-beam-upgrade 
Ports the Paradise rewrite of TG rewrite of the Beam() proc
 2018-01-14 14:59:46 -06: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
PrismaticGynoid
10b2cc7eef Multiple loadout slots (#4530) 
* Multiple loadout slots

Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.

Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.

* Log of Changing
 2018-01-14 14:47:47 -06:00
Spades
b441ccd6e3 9mm pistol updates (#4480) 
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
 2018-01-14 14:45:15 -06:00