cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,268 Commits 5 Branches 0 Tags
50834e4a7becfc93c04866813611267089883f32
Commit Graph

615 Commits

Author SHA1 Message Date
Aronai Sieyes
fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -04:00
Aronai Sieyes
0c2f8cedb5 Add UAV, UAV software 
Design placed in mechfab
 2020-04-28 23:18:08 -04:00
Atermonera
7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Leshana
3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Aronai Sieyes
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Leshana
d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System" 
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
 2020-04-06 17:31:26 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix 
Rewrites the Rewritten Event System
 2020-04-06 16:23:39 -04:00
Atermonera
f8005fda4b Merge pull request #6941 from spookydonut/parsefixes 
Fix some parse errors
 2020-04-05 02:33:28 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Aronai Sieyes
58dc70861c Update unsorted.dm 2020-04-03 12:23:21 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Aronai Sieyes
0d043fe44e Update assemblies to modern coding standards 2020-03-30 22:18:44 -04:00
Leshana
2e114ede5c Fix error handler printing bogus src.loc and usr.loc info 2020-03-30 20:30:36 -04:00
Aronai Sieyes
edd91313a8 Slow your roll, turrets 2020-03-30 12:03:39 -04:00
Aronai Sieyes
7cb680ab34 Merge pull request #6918 from VOREStation/upstream-merge-6826 
[MIRROR] Port Landmark Shuttles
 2020-03-21 00:52:08 -04:00
Leshana
41aa31f847 Refactor carp event to optionally use landmarks if present and stop at the edge of space. 2020-03-19 20:29:43 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12 
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
 2020-03-19 20:29:43 -04:00
Leshana
cf7d50978e Fix list_values to support lists of lists. Fix missing variable init. 2020-03-19 20:28:53 -04:00
Novacat
4cd077019f Merge pull request #6683 from Novacat/nova-heterochromia 
Species consolidation
 2020-03-19 18:55:54 -04:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Unknown
c960a9ec30 Finishes this PR 2020-03-17 14:00:02 -04:00
Atermonera
e3a67b3050 Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts 2020-03-17 00:22:05 -04:00
Leshana
9cbdf184ff Ported Basic Overmap Functionality 
- Ports the overmap, ships, sectors, and "landable" ships from baystation.
- Ports necessary computers to control ships and overmap shuttles.
- Shims missing machine and computer functionality pending future enhancements.
- Includes required new sprites and sounds.
 2020-03-11 11:11:40 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles. 
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
 2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Repede
eca5d6f7a0 fixes missing pass check 2020-03-01 15:21:59 -05:00
Aronai Sieyes
a5af4695fc Disable bicon() icon object cache, and create text tag cache 2020-03-01 15:02:08 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -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
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Repede
5178fe3419 Geneshadekins will stop phasing on death. 2020-02-15 14:00:25 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
80ec8ac200 Merge pull request #6656 from Amunak/countable-lists 
Prettifies closet contents list with (newly added) countable variant of english_list
 2020-02-01 18:01:23 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Aronai Sieyes
fec8571d65 Ban/unban, note/unnote, kick to webhook 2020-01-15 21:26:56 -05:00
Heroman
ede140ec9c Fixes grub event end announcement not functioning 2020-01-14 05:58:38 +10:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Unknown
750c6f0ea7 Remove medicine bottle from TE Whitelist 2019-12-31 18:09:13 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00