cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 5 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

183 Commits

Author SHA1 Message Date
Neerti
31856524ad Makes goggle overlays less harsh, and scale beyond 15x15 tiles (#6809) 2020-03-11 20:34:27 -04:00
Leshana
86c435f4b7 Ports Skybox Parallax 
- Port based on Baystation's implementation and customized for our code and usages.
- Switched space icon_state permutation to a "dust" overlay that is permutated the same way. As an overlay, the dust can be *above* the parallax planes. Space turfs are now white to allow skybox to BLEND_MULTIPLY onto them.
- Added skybox hud effect that replaces background space turfs with an image moved to create a parallax effect.
- Added skybox subsystem to generate and manage skybox parallax images, and lots of images for it!
 2020-03-11 11:11:40 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
9246b2ac51 Adds onclick check for the danger/feralness indicator 2019-12-31 08:46:36 +10:00
Heroman
8f6878e6db Implements ferality indicator for xenochimera 2019-12-30 10:22:57 +10:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1 
Ports Radial Menus
 2019-05-28 14:25:49 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Heroman
4a5512c864 hud, procs work 2019-04-27 11:20:35 +10:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Woodratt
cd20465d38 Holomap Port 
- Port of Holomaps from Virgo
 2018-08-02 15:52:56 -07:00
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Mechoid
57ab0e715b Constructs 2.0 - Living Stone (#5040) 
* Construct Overhaul + Related Fixes/Tweaks
 2018-04-04 23:45:00 -07:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Arokha Sieyes
e14857b169 POLARIS: Ventcrawling assistance 2018-03-25 17:07:54 -04:00
Arokha Sieyes
737abb9227 POLARIS: Ventcrawling assistance 2018-03-19 23:01:00 -04:00
Atermonera
09a945a3af Merge pull request #5027 from Verkister/borghud 
Couple borg UI fixes.
 2018-03-16 11:24:43 -07:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe
9f56416684 Merge pull request #5037 from VOREStation/aro-updateicons 
Rewrite human/update_icons()
 2018-03-11 21:03:10 -05:00
Verkister
f54383b995 vr 2018-03-09 22:59:47 +02:00
Arokha Sieyes
53a185f838 U_I Phase 2.0: Code cleanup 
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
 2018-03-08 19:33:44 -05:00
Verkister
8cffc2298c Readies our borg stuff for next sync fixes. 
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
 2018-03-07 11:29:46 +02:00
Verkister
f554062103 Couple borg UI fixes. 
-Fixes missing default module UI icons.
-Fixes the UI mudule icons breaking on relog. (oh please who the fuck puts a ..() at the top when the parent proc is nothing but a single return???)
 2018-03-07 10:19:06 +02:00
Nerezza
9d7f7a7e5e Misc rig fixes/tweaks 
EVA suit no longer stores toolboxes because those use a volume inventory.

CE's suit no longer holds pickaxes and ore satchels, but can now hold inflatables.

Adjusted get_breath_from_internal() proc to disable rig internals if the helmet is retracted and no suitable mask is in place.

Adjusted the internals button to ignore offline rigs.
 2018-03-06 13:49:14 -06:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Arokha Sieyes
6da9eb5451 Fix HUD creation and ventcrawling 2018-02-21 17:47:19 -05:00
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Arokha Sieyes
02e490af7a VS: Implement shadekin as a legit big deal 2018-02-15 01:15:24 -06:00
Arokha Sieyes
5c08ee7a2a POLARIS: Simple Animal Player QOL 
Adds a HUD when controlling a simple animal. Allows intents, mostly harm and help if they don't have hands. Disarm and grab if they do. Gives them a generic hud, and adds a var to decide if they have hands or not. Adds a var printed to any client that joins into a mob to explain how to play them, or lore stuff, or whatever you feel like.
 2018-02-15 01:15:22 -06:00
Aronai Sieyes
52fe8ba6e4 Make Darksight Great Again (#4626) 
* Polaris port of darksight adjusting

* I really need to stop doing this, don't I?
 2018-01-25 18:01:33 -06:00
Arokha Sieyes
947a59e926 POLARIS: Make eyes adjust in the dark 
Based on how dark it is, how much darksight you have, etc.
 2018-01-24 01:59:55 -05:00
Leshana
436d48b337 Update VOREStation specific code to use merged in features. 
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
 2018-01-19 18:15:47 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Arokha Sieyes
9c86e3b5d7 Upstream merge of material scanner overlay 2018-01-17 17:44:46 -05: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
1b180a8fd3 POLARIS: The return of the material scanner overlay 2018-01-14 19:26:54 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Neerti
cca2cc5a23 Adds Berserk 2018-01-11 01:35:14 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00