cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 8 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

122 Commits

Author SHA1 Message Date
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
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
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
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Heroman3003
b85d43bc21 Allows ghosts with backups to ping medical again 2019-04-09 10:28:55 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
76f9c16153 Merge pull request #4837 from Heroman3003/borg-sleever-interaction 
Allows putting bodies into resleeving pod via drag-and-drop
 2019-03-28 22:00:14 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Heroman3003
f5e7961f6b Allows putting bodies into resleeving pod via drag-and-drop 2019-03-07 09:17:32 +10:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Arokha Sieyes
ed726ecfbc Biomass change compensation 2018-06-24 15:25:36 -04:00
Arokha Sieyes
7312120662 Fix resleeving UI, make compatible 2018-06-16 14:39:55 -04:00