cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 5 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

10989 Commits

Author SHA1 Message Date
SplinterGP
6b1cb4e1ff Adds haemophilia too and reset button 2020-05-05 20:53:41 -03:00
SplinterGP
3ad4e4a535 Disabilities out of trait system 2020-05-05 15:46:30 -03:00
Izac Joof Forsgren
8c260eb53f Merge branch 'master' into izac 2020-04-26 04:52:57 +02:00
izac112
983faf4531 Does not work and we have traceur 
This one does not and never has worked and now we have traceur so this is kind of redundant.
 2020-04-26 04:35:06 +02:00
Shadow Quill
aa3a467eef Updates the link 2020-04-19 16:38:54 -05: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
Aronai Sieyes
13b5238ca0 Merge pull request #7273 from VOREStation/sscleanup/remove-processScheduler 
Remove the processScheduler
 2020-04-15 15:25:46 -04:00
Leshana
15665eea2a Another fix for Runtime in update_icons.dm,254: Cannot execute null.GetUIState(). 
- This time lets just ensure dna is instantiated no matter who is calling dress_preview_mob().
 2020-04-14 18:18:33 -04:00
Leshana
13d7408058 Fix null values being present in mob_list. 2020-04-14 17:03:42 -04:00
Leshana
3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Repede
0e6cbfa541 Merge branch 'master' into borgfix 2020-04-13 19:13:30 -04:00
Repede
be274378f0 Removes one POI that causes issues with ZAS (space tiles) 
Fixes service borgs and blade to not have oops icon or missing icons.
 2020-04-13 19:12:48 -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
Novacat
ee4ca5aa52 Update spore.dm 2020-04-13 07:31:19 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Aronai Sieyes
4e0a62996b Add nav console modular program and fix crew mon bug 2020-04-12 22:52:57 -04:00
Aronai Sieyes
faacf88b5f VS: ITV Talon offmap spawn map 2020-04-11 12:04:39 -04:00
Aronai Sieyes
f8d920fd02 Allow 'offmap spawn' jobs to be isolated from station employees 2020-04-11 12:03:10 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Repede
6cdee7f423 Merge branch 'master' into kk-boozetraits 2020-04-10 16:59:33 -04:00
Leshana
a96caa5f70 Update Lobby stat panel to show voting and server init status. 2020-04-10 11:41:38 -04:00
KasparoVy
a6c042e4a4 Clarify Primary Nutrition Source 
Issue #7181
 2020-04-10 00:04:47 -04:00
Verkister
a95e1a61ef Fixes mob update_transform proc and mouse sizing 
-Fixes update_transform proc for mobs. Meaning that the proc now actually does something and that mobs with pre-set size multipliers now spawn in the correct size.
-Removes some textbook spaghetti code that was making mice spawn in double (triple?) feigned size multipliers in order to be scoopable. Instead makes miniscule (mob_size var) mobs (such as mice) scoopable by default.
-This also fixes morphs in mouse form becoming tiny.
 2020-04-07 19:41:44 +03:00
Novacat
9b73b67ddc Merge branch 'master' into upstream-merge-6923 2020-04-07 00:59:54 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -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
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
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Aronai Sieyes
ff718f4aef Merge pull request #7085 from KasparoVy/i-could-swear-kobolds-ate-rocks 
Adds Ore/Gem Eater Trait
 2020-04-02 10:55:36 -04:00
Aronai Sieyes
a7d5b37488 Merge pull request #7081 from VOREStation/aro-flip 
Improves *flip, adds Traceur trait
 2020-04-02 10:53:10 -04:00
Aronai Sieyes
9e00215790 Merge pull request #7075 from VOREStation/aro-multiwngs 
Allow wings with a secondary color
 2020-04-02 10:52:37 -04:00
Atermonera
4f50c50452 Merge pull request #6928 from VOREStation/pol-runtimes 
Fix 2 runtimes
 2020-04-01 22:39:14 -04:00
KasparoVy
bb756cbdc9 Adds a Rocky Diet 
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.

5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
 2020-04-01 21:52:27 -04:00
Aronai Sieyes
9b1db53bd2 Adjust traceur, taj, and teshari agility to 90 2020-04-01 15:25:17 -04:00
Aronai Sieyes
d3fae0b1d1 Improves *flip, adds Traceur trait 2020-04-01 15:09:19 -04:00
Izac Joof Forsgren
0efceb1a1a Merge branch 'master' into TFF-Mute_Thy_Merpage 2020-04-01 18:18:29 +02:00
Heroman
49b67392e0 Adjusts shadekin darkness hud 2020-04-01 15:27:54 +10:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Novacat
1cdd572e6a Merge pull request #7060 from VOREStation/upstream-merge-6902 
[MIRROR] Convert alarm_manager into SSalarm subsystem.
 2020-03-31 11:45:08 -04:00
Amaya
99b50fe6ba line #70 edit 
from -> //Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 2
to ->//Shifting in
	if(ability_flags & AB_PHASE_SHIFTED)
		ability_flags &= ~AB_PHASE_SHIFTED
		mouse_opacity = 1
 2020-03-31 16:30:37 +02:00
Killian
8fe3ec7cf8 Update human_attackhand.dm 2020-03-31 02:02:15 +01:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00
Killian
b4f227ed8a tweaked some trait descriptions, removed the neutral trait 2020-03-28 22:31:01 +00:00
Killian
81f7f04020 Merge remote-tracking branch 'upstream/master' into kk-traits 2020-03-28 22:12:20 +00:00
Repede
df4046e06f Merge branch 'master' into TFF-Mute_Thy_Merpage 2020-03-28 00:16:17 -04:00
Aronai Sieyes
b78cdf7b64 Merge pull request #7026 from ShadowLarkens/admin_utilities_and_niceities 
Added three utilities for admins & developers
 2020-03-27 22:30:21 -04:00
Repede
96de7610ef Makes teshari loneliness use to_chat so it shows properly in vchat. 2020-03-27 19:59:13 -04:00
ShadowLarkens
c44553c9d5 Added three utilities for admins & developers 
- There is a new option in the player panel labeled "Send back to
   Lobby", which will send a given player back to the lobby.
 - The player panel also has a shortcut to the "Spawn Character" verb.
 - Finally, there's a new config option that disables the warning
   message about multikeying if two mobs with the same CID are found;
   this option should NOT be enabled if multikeying is prohibited by the
   server rules. It is simply a developer tool, as multikeying is
   sometimes necessary to test new features that require two clients
   interacting.
 2020-03-27 15:41:44 -07:00
TheFurryFeline
1045a56bb3 Look, Ma! More Typo Fixing! 
Title, Affectionally -> Affectionately

Changelog Notes:

- Fixes borgs' licking adjective's, or whatever's, spelling.
 2020-03-27 18:33:21 -04:00