cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 18:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,618 Commits 8 Branches 26 Tags
d950e359056d2995b7dc90ffa3f3031663f94781
Commit Graph

90 Commits

Author SHA1 Message Date
Spookerton
a538f6fe8a Merge pull request #8696 from Atermonera/no_clone-modifier-gets-checked 
Checks the no_clone modifier stored in DNA records as a path
 2022-09-01 05:59:05 -04:00
Novacat
1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892
d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
C.L
dac24a8b7c Early Stage Lung Damage Reduction. 
Makes early stage lung damage (rupture_lung causes 10 damage) not nearly as lethal due to blood loss, but still leaves a good possibility of death via suffocation without medical treatment, but not nearly as likely, as it requires a very long run of bad RNG to achieve enough oxyloss to reach crit.

However, brain damage is still possible even with small amounts of oxyloss, , which will cause other problems later down the line

Meanwhile, late stage lung damage (30+) is untouched other than the blood loss being decreased.

This requires actual damage to be done to your lungs via things such as piercing weapons or other internal organ damage sources to reach that point.

This should be much more rare, but is a genuine medical emergency that - as testing showed - will more likely than not stack up suffocation damage and kill you over time without intervention, without blood loss even needing to peek it's head in the door to kill you.
 2022-08-01 03:00:08 -04:00
Novacat
4dbc7fe6bf Merge branch 'master' into upstream-merge-8298 2022-03-22 08:53:45 -04:00
GhostActual
61462f99e8 Base Commit 2022-03-21 16:32:15 -04:00
Heroman
4e6c965074 Adjustments to synthetic food processing 2022-03-20 09:31:52 +10:00
MistakeNot4892
3f9af78f3a /atom New() => Initialize() [MDB IGNORE] 2021-11-14 03:09:51 -05:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Aronai Sieyes
dc2c20ed89 Shuffle some synth things 2021-05-11 14:20:30 -04:00
Atermonera
d857988ce8 Swaps emote(me) out for custom_emote(). 2021-05-02 23:59:28 -04:00
Atermonera
c99e44ab22 Oops, I refactored Chemistry! 2021-04-20 23:33:41 -04:00
Unknown
41f4948621 Earlyports Stair fix from Polaris 
https://github.com/PolarisSS13/Polaris/pull/7943
 2021-03-02 17:13:14 -05:00
Mechoid
f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Unknown
bc6929535a Earlyports Polaris Fixes 2021-02-15 17:36:05 -05:00
Heroman
f03fc5f240 Fixes defib timers being 10 times as long compared to intended 2021-01-24 09:58:45 +10:00
Verkister
5018df615e Update brain.dm 2020-11-08 13:08:35 +02:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
Novacat
fd563559ad Merge pull request #9077 from VOREStation/upstream-merge-7668 
[MIRROR] Actually commit the reagent cycler's entire gimmick.
 2020-09-21 14:06:14 -04:00
Atermonera
d0fd1df327 Merge pull request #7668 from Mechoid/ReagentCyclingCycler 
Actually commit the reagent cycler's entire gimmick.
 2020-09-21 12:48:24 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
Novacat
702ccbee5c Update lungs.dm 2020-03-27 08:39:57 -04:00
Atermonera
c49c1e40f3 Fix runtimes in lungs.dm 2020-03-27 03:18:28 -04:00
Arokha Sieyes
34a9cd4561 Fix stupid lung runtime 2020-03-27 00:41:36 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Novacat
5e7735a807 Update brain.dm 2019-10-22 21:14:26 -04:00
Unknown
6333e7ab72 Ports Polaris #6492 
Fixes a divide by zero issue with brain damage and pulse.
 2019-10-22 21:13:25 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Anewbe
50ff14f8f8 Merge pull request #6079 from Mechoid/AugmentPreWork 
Augment Work
 2019-06-16 20:58:32 -04:00
Atermonera
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -04:00
Neerti
fd4dc97a8b Merge pull request #6048 from Heroman3003/promcore-decay-fix 
Fixes promethean cores decaying pointlessly
 2019-04-08 12:02:19 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Screemonster
5644ee00fd forgot to mark edit 2018-10-10 22:17:20 +01:00
Screemonster
b34714684a gives prommie cores an icon 2018-10-10 13:48:22 +01: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
Mechoid
31761714b2 Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. 2018-08-28 01:23:36 -07:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
8f9e817bf0 Language and Larynx Additions (#5402) 
* Various Language Improvements
 2018-07-13 21:13:47 -07:00
Atermonera
f7d77629af Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 15:39:37 -04:00