cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,135 Commits 10 Branches 0 Tags
ad6870c78d2956f2efecfbfc852c6ac621c313c1
Commit Graph

87 Commits

Author SHA1 Message Date
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires 
# Conflicts:
#	code/__defines/misc.dm
 2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
ShadowLarkens
7453f64833 Adjusted some colors to make it more legible, added alien multitool magic 2020-07-22 01:03:00 -07:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Aronai Sieyes
1626df366c Merge pull request #7102 from VOREStation/aro-fakez 
Improves space edge-of-map behavior and add mapping tools
 2020-04-02 10:58:13 -04:00
Aronai Sieyes
09003a6c61 Improve space map edges 2020-04-02 01:08:07 -04:00
Leshana
23482e88fa Moves topic return value defines to where they are usable everywhere. 2020-04-01 20:36:00 -04:00
Aronai Sieyes
b2605300f2 Mergey Merge Polaris VChat 2020-03-29 15:37:43 -04:00
Aronai Sieyes
8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Leshana
143ca9d981 Fixes and additional mapping convenience for landmark shuttles. 
- Improvement to web-shuttle: Don't update docking controller until jump() is completed.
  - It is now consistent with autodock behavior (for better or worse)
- Add shuttle process_state to enable processing of web shuttle autopilot.
- Convert Arrivals shuttles to be a subtype of /datum/shuttle/autodock/ferry
- Default shuttle landmarks flags to SLANDMARK_FLAG_AUTOSET
  - Made this safe and backwards compatible by having SLANDMARK_FLAG_AUTOSET not overwrite already specified base_turf or base_area
 2020-03-19 20:23:04 -04:00
Leshana
9d517f469f Simplify skybox parallax code and add support for scaling for larger client.view sizes. 
- Hooked up skybox to recalculate it's scaling when the view changes.
 - Added constant defines to clarify where the magic numbers are coming from.
 2020-03-15 17:59:20 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Novacat
1b5fcc052c Update misc.dm 2020-03-09 01:26:36 -04:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -05:00
Atermonera
0111815165 Buffs radiation so it isn't defeated by a thin sheet of lead. 2019-12-20 00:51:06 -05:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Anewbe
d017075732 Merge pull request #6219 from Mechoid/Event_Retweakening 
Tweaks the NewTM event system further
 2019-06-19 23:34:26 -04: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
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04: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
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04: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
5c35b9f284 Forces mech construction to work with the is_tool() procs 2018-08-04 20:42:53 -05:00
Atermonera
c07d42e75a Merge pull request #5426 from Anewbe/deadringer_fixes 
Fixes a few bugs associated with the Dead Ringer
 2018-07-22 00:26:47 -04:00
Anewbe
1f0973aa62 Fixes a few bugs associated with the Dead Ringer 2018-07-20 17:50:48 -05:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281) 
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
 2018-05-25 16:26:31 -07:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.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/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Arokha Sieyes
297ac38eca Message send failure reflection 
When a post is too long to send, reflect it back to the user in the chatbox so they can copypaste it into separate messages. Also increases the message limit from 1024 to 2048. If a message is longer than 5-messages worth, it is not reflected and a warning is sent instead to avoid easily consuming bandwidth for DDOS purposes with long messages.

I'd like to add markers in the message where the posts would have been truncated but that's... complicated.
 2018-05-16 17:57:26 -04:00
Anewbe
8615dafd40 Merge pull request #5255 from VOREStation/pol-fps 
Adds a client FPS setting
 2018-05-10 00:27:44 -05:00
Arokha Sieyes
8f876de645 Adds a client FPS setting 2018-05-07 23:37:47 -04:00
Arokha Sieyes
fe5633e3d8 Adds a client FPS setting 2018-05-07 23:36:47 -04:00
Arokha Sieyes
98eb796021 Colorblindness 2018-05-03 17:58:22 -04:00
Arokha Sieyes
8fbf78974a POLARIS: Colorblindness Traits/Modifiers 2018-05-03 17:51:52 -04:00
Neerti
be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04:00
Arokha Sieyes
55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00