ShadowLarkens
1d655268a4
Fixed merge conflicts and errors, everything seems to work
2020-04-23 18:25:25 -07:00
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07: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
df77f1bcf2
Port Bay computer icons
2020-04-02 10:30:21 -04:00
Arokha Sieyes
e6f766d4c6
Rework resleeving sickness for voredeaths
2020-03-12 12:48:14 -04: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
aabba971c6
Merge pull request #6626 from VOREStation/aro-discicons
...
New sprites for discs with unique colors
2020-03-01 10:52:13 -05:00
Aronai Sieyes
967fd17048
Rename to discs_vr.dmi and correct copypaste error
2020-02-29 10:37:41 -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
Aronai Sieyes
b3b51a7c3a
New sprites for discs with unique colors
...
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.
Sprites from CEV-Eris.
2020-02-20 21:37:15 -05:00
Arokha Sieyes
1d9e5be122
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
Novacat
db2e0bf71c
Merge pull request #6573 from Heroman3003/hard-safety
...
Prevents resleeving sickness from affecting hardvore victims
2020-02-14 09:35:58 -05:00
Heroman
b09c8c5a38
Prevents resleeving sickness from affecting hardvore victims
2020-02-14 10:07:02 +10:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Razgriz
1cfc6cc514
WHAT IS WRONG WITH YOU
...
It won't freaking compile. This is the original file now. No mentions of resleeving sickness
2020-01-13 19:43:11 -07:00
Razgriz
3cce0a1bfa
Remove Resleeving Sickness
2020-01-13 19:25:26 -07:00
Razgriz
549929817e
Remove Resleeving sickness
2020-01-13 19:04:55 -07:00
Razgriz
50609a9b1d
Update machines.dm
2020-01-13 19:03:26 -07:00
izac112
f093367c69
fixed stupid tab
2020-01-13 20:32:30 +01:00
izac112
097d8e8790
Removes the "Physical" sides of the sleeving sickness
...
Aka the brute, burn, pain and melee damage modifiers.
Signed-off-by: izac112 <izac10@live.com >
2020-01-13 20:29:07 +01:00
izac112
8423b036b8
Reduces duration to 25 minutes on a un-upgraded machine
2020-01-13 20:27:24 +01:00
izac112
5713226986
Vore death or not should be the same
2020-01-13 20:19:18 +01:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Heroman
0c5ddf8cbb
Stat adjustments
2020-01-09 09:07:11 +10:00
Heroman
b8d301649c
Removes forgotten closing tags
2020-01-07 18:30:30 +10:00
Heroman
2b10027024
Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides
2020-01-07 17:02:39 +10:00
Novacat
9d21d59be2
Update resleeving_sickness.dm
2020-01-04 17:41:35 -05:00
Heroman
6d35de30b4
Less pain, return of minor burn/brute
2020-01-05 08:17:19 +10:00
Heroman
c434b01190
Wrong calculation + return of speed buff
2020-01-04 09:12:54 +10:00
Heroman
418aa9195a
Missed parenthesis
2020-01-04 08:51:48 +10:00
Heroman
a56e3b4990
Rebalances the debuff again, no defensive penalties, much larger offensive penalties
2020-01-04 08:44:23 +10:00
Heroman
88323a1121
Removes genetic mutations, removes cryotubes from resleeving labs
2020-01-04 07:42:57 +10:00
Heroman
e2cd78159d
removes unnecessary 0's
2019-12-31 20:36:43 +10:00
Heroman
89636b06c5
Adjusts the sickness values
2019-12-31 20:33:40 +10:00
Heroman
f8e2e7bf19
Removes bleeding rate debuff from resleeving sickness
2019-12-30 06:02:07 +10:00
Heroman
d7a7110b94
Rebalances time calculation for sickness. 45 new maximum, 30 still a median, 15 still a minimum
2019-12-30 05:18:29 +10:00
Heroman
6eff7bd443
Undoes the speed buff for the printer (keeps the healthcap removal)
2019-12-29 20:21:16 +10:00
Heroman
821ecf1f88
Makes the sickness properly refresh the duration
2019-12-29 17:26:18 +10:00
Heroman
be15b324e7
Buffs body printer
2019-12-29 10:21:42 +10:00
Heroman
eb5a3ebf57
Adds resleeving sickness
2019-12-29 10:12:39 +10: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
Unknown
f68a82b81f
Replaces lentext with length
2019-12-12 13:13:18 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Rykka
45abd9ae01
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Verkister
d181812987
Fixes high endurance bodies dying in grower pod
...
The math that was supposed to protect low endurance bodies had been mistakenly calculating the clone damage reduction with a double-negative, causing the opposite effect. The cloneloss added on top of the maxhealth apparently was intended to get a reduction of 25hp, but because the number it was being reduced from was already negative, it was instead causing a high endurance body (125 maxhealth) receive a total of 125+75 cloneloss
2019-10-31 17:14:53 +02:00
cebutris
d595f99ac0
oi-vey
2019-09-17 15:10:49 -04:00
Cebutris
61cc46d6d9
delete-khi-again
2019-09-17 12:16:21 -04:00
Cebutris
6db6d6f0c7
deletes more KHI, reworks some wording and other corps
2019-09-14 15:13:11 -04:00
