cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,176 Commits 8 Branches 26 Tags
86e413bf00a71afc9831e355d2b6ff72c3d2eed3
Commit Graph

801 Commits

Author SHA1 Message Date
Arokha Sieyes
f1e47c85f4 Xenochimera can't take synth limbs 
As requested in, and Resolves #3564
 2018-04-30 15:45:50 -04:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Aronai Sieyes
a849010ab1 Makes organ removal/attachment right again (#5192) 
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
 2018-04-25 12:03:10 -07:00
Cameron653
d9be096edb Fixes tesh being able to use all prosthetics 
Thanks to Aronai for the solution
 2018-04-23 23:03:00 -04:00
Cameron653
a6b25bc79a whoops 
Credit to Nestor for doing the original coding, however.
 2018-04-23 17:00:32 -04:00
Cameron653
aa97863a73 Ever hit the "push" button and then realize "Oh shit I forgot something"? 2018-04-23 16:54:22 -04:00
Cameron653
6c75c72dd2 Adds missing Teshari DSI 
https://i.imgur.com/UmrLEDT.png - (White)
https://i.imgur.com/vXGIFi3.png - (Light Blue)
https://i.imgur.com/H8NFgTD.png (Light Pink)
Operates the same as every other DSI.
 2018-04-23 16:51:37 -04:00
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Atermonera
d49ac27d7f Merge pull request #5102 from Verkister/orgons 
Fixes inconsistencies in organ system
 2018-03-31 12:15:51 -07:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Arokha Sieyes
95877cc30a POLARIS: Fixes #3308 (VS) - Skrell lack eyes 2018-03-25 16:54:50 -04:00
Arokha Sieyes
98ca792b51 Increase prom limb health by 60% 2018-03-25 10:51:44 -04:00
Verkister
bf8bfc6e00 Fixes inconsistencies in organ system 
-Seems the years old conversion to turn old limb names and tags and such to BP constants was never finished.
-This also fixes warning spammy diona organ tags.
 2018-03-24 16:40:58 +02:00
Anewbe
3df290f46f Ports antibiotics overhaul (#5050) 
* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles
 2018-03-22 09:55:49 -07:00
Arokha Sieyes
39d3eeac62 Change to Teshari to test for bug 
Removing these, to see if they are related to the Teshari bug. These are the only two unique sprite features that I can see.
 2018-03-21 23:24:41 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
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
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04: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