cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 7 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

1187 Commits

Author SHA1 Message Date
Aronai Sieyes
67c8945a66 Prevent holopad chat from going to lobby 2020-05-07 21:34:21 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
kcin2001
6d15fde1e3 chomp edit 2020-05-03 16:56:33 -07:00
kcin2001
5e4bdc5aaf nudges north an south hunter dome up by 1 pixel to match the rest 2020-05-03 16:25:58 -07:00
KasparoVy
eba6e230d1 Adds 2 New Ears, a Tail & a Few Markings 
Adds short/terrier & thin/jackal Vulpkanin ears (dual-colourable)
Adds a dual-colourable tail inspired by Ward-Takahaski cybernetics.
Adds a few markings:
--> Vulp Short Nose (shifted 1 pixel closer to the face in the east/west sprites)
--> Vulp Alt. Face (Vulpine facial hair but in marking form)
--> Taj Alt. Nose (Tajaran nose marking but colour mult & the same colour in all dirs)
--> Talons (Inspired by Ward-Takahashi Spirit markings)
--> Claws (Inspired by Ward-Takahashi Spirit markings)
 2020-05-03 02:25:21 -04:00
Aronai Sieyes
311c4e35df Clean up last_area garbo 2020-04-30 15:42:55 -04:00
Aronai Sieyes
8ab8e3494e Merge pull request #7519 from VOREStation/aro-hetr 
Remove vorestation heterochromia since Polaris has it
 2020-04-29 19:24:06 -04:00
Aronai Sieyes
9d6082104d Remove vorestation heterochromia since Polaris has it 2020-04-29 18:36:48 -04:00
Greenjoe12345
ff628daae1 Adds heterochromia for humanoid species and Teshari (#7016) 
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
 2020-04-29 15:11:41 -04:00
Aronai Sieyes
c2ca984d18 Merge VS changes for telecomms 2020-04-29 10:24:37 -04:00
Atermonera
eb6eb7bcd6 Refactor telecomms and consoles to operate on logical zlevels 2020-04-28 17:56:35 -04:00
Atermonera
7f6b583b24 Merge pull request #7025 from atlantiscze/2020_04_21_Cleanup 
Removes stray unused variable that triggered a compile warning
 2020-04-25 16:36:34 -04:00
ShadowLarkens
1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Razgriz
9806fd2d58 Update login.dm 2020-04-19 20:46:38 -07: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
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
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
Razgriz
5cb1969d2a Add files via upload 2020-04-12 02:05:32 -07:00
Razgriz
2fbc749229 Merge branch 'master' into UpstreamMergeApril2020 2020-04-11 17:09:57 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07: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
Leshana
a96caa5f70 Update Lobby stat panel to show voting and server init status. 2020-04-10 11:41:38 -04:00
ARandomAlien
324f18753e Add files via upload 2020-04-09 05:59:00 -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
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Unknown
80e5344901 Fixes Fennec/Xenohybrid hairstyles 2020-03-20 20:44:41 -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
Unknown
a6a12b3a9e Merge remote-tracking branch 'VOREStation/master' into nova-heterochromia 2020-03-17 13:16:11 -04:00
Razgriz
63d7f35218 Add files via upload 2020-03-15 23:41:31 -07:00
Atermonera
f46c0ab673 Merge pull request #6828 from Schnayy/hairupdate 
Hair adjustments and additions
 2020-03-16 01:59:00 -04:00
Repede
6e293183ad Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate 
# Conflicts:
#	icons/mob/hud.dmi
 2020-03-04 08:17:38 -05:00
Atermonera
2af53022fe Merge pull request #6770 from Mechoid/ReadyUpNotice 
High-priority Job Display
 2020-03-03 01:37:00 -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
Unknown
2604093ff0 Species consolidation 
- Consolidates the two zorren species into one zorren species.
- Merges Xenohybrid into Custom species, Xenohybrids no longer whitelisted.
 2020-02-25 15:45:10 -05:00
Novacat
48e022ed1b Update new_player.dm 2020-02-24 20:30:09 -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
Soft
702557df07 VS: Loading screen 2020-02-19 19:55:01 -05:00
Killian
dcd691245c feex title 2020-02-17 10:35:55 +00:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Leshana
fffd922cde Fix character setup preview icons rendering prior to SSAtoms initialization 
- Rendering the characters involved creating mannequin mobs, prior to SSAtoms init these would not be initialized and thus have no DNA.  This prints many warning messages, causes runtimes, and ultimately the icon does not render correctly.
- Its fixed here since it seems that needing to use mobs prior to initialization is a pretty unique edge case.  Comment added to explain to future us.
 2020-02-04 16:33:22 -05:00
TheFurryFeline
8213b7ca1f Cotton Is Tasty 
Changelog Notes:

- Backports Cotton hair lost in rebase. Work from https://github.com/CHOMPstation/CHOMPstation/pull/186
 2020-01-17 00:13:29 -05:00