cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,419 Commits 8 Branches 0 Tags
bf0babb9ecc79d627aaa59ca4d60cb30460d2fce
Commit Graph

784 Commits

Author SHA1 Message Date
Arokha Sieyes
f062abdcfa POLARIS: Fixes #3308 (VS) - Skrell lack eyes 2018-03-20 14:22:51 -04:00
Arokha Sieyes
8b647cce73 VS: Fix various screams and emotes in bellies 2018-03-18 20:36:00 -04:00
Arokha Sieyes
decfbef934 POLARIS: Dropped limbs go into the drop location of the victim 2018-03-18 20:10:08 -04:00
Arokha Sieyes
44871477a0 POLARIS: Fix a couple organ dropping bugs 2018-03-17 22:15:13 -04:00
Arokha Sieyes
299f6e4299 VS: Nano ignores organ robotics sometimes 2018-03-17 19:45:59 -04:00
Arokha Sieyes
42e3261428 Final tweaks 2018-03-17 12:33:04 -04:00
Arokha Sieyes
2107372404 Protean species 2018-03-17 12:14:13 -04:00
Aronai Sieyes
29ae148dcf Merge pull request #3244 from VOREStation/aro-infectheal 
Prevent infections from healing you, small tweaks
 2018-03-16 19:54:38 -04:00
Aronai Sieyes
6bb551c49a Merge pull request #3247 from VOREStation/aro-promfix 
Fix several organ bugs + Prometheans
 2018-03-16 19:54:28 -04:00
Arokha Sieyes
34c0a69918 POLARIS: Fix several organ bugs 
Eye color without needing eyes, Prometheans not dropping limbs, robotize not always honoring your parameters
 2018-03-16 19:10:01 -04:00
Arokha Sieyes
c43da73796 POLARIS: Prevent infections from healing you, small tweaks 2018-03-15 23:53:55 -04:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
0dbb0b19df Block prometheans from using synthparts 2018-03-12 23:00:12 -04:00
Arokha Sieyes
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Aronai Sieyes
8ff288669d Merge pull request #3128 from aztectornado/hollow-bones 
Adds hollow bones trait
 2018-03-09 14:34:07 -05:00
Leshana
1df2ee7537 Merge pull request #3186 from VOREStation/aro-antibio 
Remove Spaceacillin
 2018-03-09 13:24:50 -05:00
Arokha Sieyes
45c91a5176 POLARIS: Spcllin code refactor, +new antibio 2018-03-09 13:11:24 -05:00
Arokha Sieyes
53a185f838 U_I Phase 2.0: Code cleanup 
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
 2018-03-08 19:33:44 -05:00
Arokha Sieyes
3be602dece U_I Phase 1.3: Previews are broken, so that's a thing 2018-03-08 19:31:55 -05:00
Anewbe
14f48b84cd VeyMed limbs (and organs) are now more vulnerable to EMP (#4987) 
* VeyMed limbs (and organs) are now more vulnerable to EMP

* Changelog
 2018-03-06 13:02:06 -08:00
Atermonera
982840c14c Merge pull request #4943 from Anewbe/robosparks 
Robolimbs require repair at 30 composite damage
 2018-03-06 13:01:39 -08:00
Aztectornado
305451ce07 Makes robotic limb damage scalable 2018-03-05 23:31:40 -06:00
Arokha Sieyes
fa95ae3d42 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2018-03-04 13:32:53 -05:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Belsima
3c6e7a95b9 orgam 2018-03-03 11:43:50 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
Belsima
a578eeeb85 plushie love (#4964) 
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
 2018-02-27 14:49:06 -06:00
Atermonera
61ca538e06 Merge pull request #4929 from Anewbe/splints 
Splints no longer perfectly prevent negative effects from broken bones
 2018-02-24 22:52:25 -08:00
Anewbe
8eb72ead35 Robolimbs require repair at 30 composite damage 2018-02-24 02:37:09 -06:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Atermonera
9993031500 Merge pull request #4917 from Anewbe/surgery_oversight 
Corrects an oversight with surgery and defibs
 2018-02-22 18:25:04 -08:00
Anewbe
af62498e28 Progress 2018-02-22 19:49:30 -06:00
Anewbe
14336e7985 Corrects an oversight with surgery and defibs 2018-02-21 18:57:51 -06:00
Anewbe
76fab07f52 Zheng Hu Improvements 2018-02-20 20:58:36 -06:00
PrismaticGynoid
8712d7e902 Two organ bugfixes (#4877) 
* Two organ bugfixes

First, allows FBPs with synthetic brains (posis and drones) to actually die from massive brain damage. Before, although the damage would still affect them, robotic vital organs taking 60+ damage would never actually kill the owner.

Second, stops the zombie organs bug from popping up in normal play. You were able to repair all the damage on an organ, but not the ORGAN_DEAD status, leading to "dead" organs that still functioned (and that you could never die from them taking damage). Now, repairing the damage surgically will remove that.

* Repair for dead undamaged organs too
 2018-02-20 10:39:03 -06:00
Belsima
3f4576dc58 rainbow 2018-02-19 14:52:50 -05:00
Anewbe
1c1e15a221 EMPs no longer make meat eyes fuzzy (#4856) 2018-02-18 01:09:04 -08:00
Leshana
ef3df27528 VOREStation Specific Merge Changes 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
 2018-02-17 16:56:31 -05:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Anewbe
a93cb256ec Ports Vorestation's emp effects and ion projectiles (#4818) 2018-02-15 12:29:33 -08:00
Screemonster
2cd47f9c80 squashed commits - ion pistol refactor and away mission emp nerf 2018-02-11 09:27:40 +00:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
Anewbe
3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe
67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00
Cameron653
1999fc2a2a Changes 'undislocate' to 'relocate' (#4650) 
* Chaning undislocate to relocate.

Have to use web browser for this one at the moment.

* Changes undislocate -> relocate

* Last file to change to relocate

* Changes it to the best medical term for the action.

* Reduce -> Relocate
 2018-02-03 22:45:50 -06:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681) 
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
 2018-02-03 14:40:09 -06:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	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-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
 2018-01-27 23:08:53 -05:00
Mechoid
6df90c09e3 Allows Prometheans to be cloned from their Core. (#4602) 
* Allows Prometheans to be cloned from their Core.

* Swap brain cloning dependency from the cloner to the brain itself.

* Fffffff Changelog. And to_chat.
 2018-01-24 18:19:32 -06:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00