Commit Graph

190 Commits

Author SHA1 Message Date
Verkister
274d1fa1d2 Earlyports synth var fix
Fixes synthetic var not getting cleared when loading character slots. Due to the char setup mannequin mob's nature of being a single same mob just getting its properties loaded from save slots, loading/making a synth character would permanently mess up the var for all non-synth chars on the roster and cause issues with synth-related settings because there was nothing in the code to clear the var.
2021-06-17 12:16:46 +03:00
Aronai Sieyes
394d5b148a Merge pull request #10562 from VOREStation/Arokha/fixprot
Fix mistake made in 04625a5
2021-06-06 05:24:33 +00:00
Aronai Sieyes
5c46d1bd45 Merge pull request #10537 from VOREStation/Fixes/10321
Fixes #10321
2021-06-02 16:02:54 +00:00
Chompstation Bot
8911fe1de3 Manual port Polaris Fixes 2021-05-22 20:22:28 +00:00
Novacat
d318defa59 Merge pull request #10302 from VOREStation/Arokha/joinfixes
Fix two character spawn bugs
2021-05-12 04:13:20 +00:00
Nadyr
7dd7118cb4 Merge branch 'master' into upstream-merge-10265 2021-05-11 23:06:30 -04:00
Razgriz
63867629e4 Port one line that wasn't ported
Port one line that wasn't ported in CHOMPStation2#1888 from https://github.com/VOREStation/VOREStation/pull/10247/files

I'm scared.
2021-05-11 01:42:24 -07:00
Verkister
1b2b54d58c Fixes Wing/Tail/Ear Sanitation
manual port of https://github.com/VOREStation/VOREStation/pull/10279
2021-05-10 17:49:13 +03:00
Nadyr
8654aff7b6 github you fuck 2021-05-10 01:32:23 -04:00
Nadyr
88b1b04bd8 Merge branch 'master' into upstream-merge-10247 2021-05-10 01:30:24 -04:00
Chompstation Bot
3217535913 [MIRROR] Fixes Virgo #10254. 2021-05-07 07:27:08 +00:00
Chompstation Bot
f38a740237 [MIRROR] Body style selection and sanitizing refactor. 2021-05-05 18:46:14 +00:00
Nadyr
8d05156f42 earlyport fix 2021-04-30 02:33:07 -04:00
Nadyr
0ac27ecbe3 Update 03_body.dm 2021-04-30 01:14:57 -04:00
Nadyr
1e0f3485ac Update 02_language.dm 2021-04-30 01:11:33 -04:00
Chompstation Bot
dde4aa05bd [MIRROR] Sanitizes languages, ears/wings/tail prefs on login 2021-04-28 16:30:43 +00:00
Nadyr
e6a31f97b1 Update 02_language.dm 2021-04-11 06:12:20 -04:00
Chompstation Bot
9029dfd48d [MIRROR] Prevented Teshari from selecting positronic brains. 2021-04-02 17:58:45 +00:00
Nadyr
8395359d92 Update 03_body.dm 2021-03-21 02:14:02 -04:00
Nadyr
d07f2da76a Update 03_body.dm 2021-03-21 02:11:44 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Razgriz
eb8bf0f143 Update 03_body.dm 2021-02-13 15:59:07 -07:00
Chompstation Bot
a5801d04b6 [MIRROR] Adds proc to properly update human icon gender 2021-02-10 19:14:53 +00:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
listerla
2b600cbe85 Changes default skin tone from 35 to 110 2020-09-05 11:09:18 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Rykka
62e9c9c609 Earlyports Hair Gradients + Fixes for them!
Earlyports: https://github.com/VOREStation/VOREStation/pull/8445 and https://github.com/VOREStation/VOREStation/pull/8353 and https://github.com/VOREStation/VOREStation/pull/8360

Example image:
![](https://user-images.githubusercontent.com/31356648/86080653-6b1edc00-ba61-11ea-9225-ddd021ff3bcc.png)
2020-08-04 16:35:01 -04:00
BlackMajor
8305222642 Quick edit 2020-07-26 20:01:34 +12:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Leshana
c59cb0cda4 Fix indentation syntax error. (#7320)
Bad extra indent causes compile failures on strict DM compilers.  Breaks linting.
2020-07-07 02:42:31 -04:00
Layne
989ca48282 ice cream 2020-07-04 00:37:03 -04:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Layne
7b7a1b853e ice cream 2020-07-01 18:56:09 -04:00
Atermonera
5fbc4f3189 Merge pull request #7304 from KillianKirilenko/kk-bio
Offload Defibrillatability from NO_SCAN
2020-06-25 15:44:49 -04:00
Atermonera
90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Atermonera
9a6b5a71f3 Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode 2020-05-30 14:10:54 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Leshana
fb532ac920 Refactor Character Setup to use MAP
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
2020-05-21 19:04:56 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02: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
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
Aronai Sieyes
0b79828ec9 Forbid and sanitize out hyphen as language prefix 2020-04-25 13:03:47 -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
9bbfd211a3 Vorestation edit fixes 2020-03-15 15:17:27 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
SplinterGP
55a8639c67 Fix to other species being able to wingdings 2020-03-06 14:45:53 -03:00