cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,167 Commits 8 Branches 26 Tags
488fdf85eccdfc61c7f1c212bc9d285a04594de8
Commit Graph

71 Commits

Author SHA1 Message Date
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452 
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
 2020-08-21 13:32:51 -04:00
Rykka
16da38037d Fix incoming merge conflicts with PR #8757 
NIF Heatsinks will preserve their behavior of preventing BASE heat increases, but will not be able to compensate for if your NEW heatsink component is damaged or disabled.

Robolimb damage remains scalable as the conflict was simply taht the check was indented/nested underneath another.
 2020-08-21 05:26:49 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
SplinterGP
cf491a56b7 Gives FBP's a proc to change their monitor display without using a mask item. 2020-08-20 21:25:20 -04:00
SubberTheFabulous
eb48eef20e Adds New Prosthetics Set (#7467) 
* Adds a new FBP CS set, removes old alt2

* Adds a new FBP CS set, removes old alt2

* Readds Cyber Solutions - Array

* Readds Cyber Solutions - Array

* Adds a new FBP CS set

Changelog
 2020-08-17 18:04:54 -04:00
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Aronai Sieyes
91d4e6897a Prosthetic Expansion: Advent of Species 
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
 2020-03-14 14:04:06 -04:00
Aronai Sieyes
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -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
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Atermonera
9a994e4e16 Merge pull request #6226 from SubberTheFabulous/MonitorFix 
Makes some alt. roboheads actually use their monitors
 2019-06-24 15:24:23 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
1415c6cd0a Merge pull request #4843 from VOREStation/upstream-merge-5993 
[MIRROR] Fixes the greatest bug to affect our time.
 2019-03-28 22:00:55 -04:00
Novacat
92a9d81599 Update robolimbs.dm 2019-03-28 20:33:14 -04:00
Neerti
765af99014 Merge pull request #5993 from Mechoid/Fix_A_Semicolon 
Fixes the greatest bug to affect our time.
 2019-03-08 20:19:01 -05:00
Neerti
6211735bac Fixes Diona and Promethean prosthetics. 2019-02-18 03:53:46 -05:00
Aronai Sieyes
02baa415f6 Remove Veymed portion of change for weakness 2018-06-15 08:55:20 -04:00
Anewbe
1d054fd29e Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 20:49:11 -04:00
Anewbe
fad161aeb7 Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 16:22:56 -04:00
Arokha Sieyes
f1e47c85f4 Xenochimera can't take synth limbs 
As requested in, and Resolves #3564
 2018-04-30 15:45:50 -04: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
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
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
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
Anewbe
76fab07f52 Zheng Hu Improvements 2018-02-20 20:58:36 -06:00
Belsima
3f4576dc58 rainbow 2018-02-19 14:52:50 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
SubberTheFabulous
9dbb99b515 Adds yet another FBP, also fixes a little sprite error (#4419) 
* Adds new set of cyberlimbs, fixes annoying sprite

* Adds a new set of robolimbs

FOR SOME REASON

* Fixes stuff

i miss things ok

* Update robolimbs.dm

* Update robolimbs.dm
 2017-12-11 00:46:51 -06:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
shazbot194
d199d4caf7 Adds in the option to color all synth parts and two sets of parts 
As the titles says
 2017-10-15 14:56:14 -08:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Belsima
c67865ac63 Adds a load of new FBPs. (#3850) 
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
 2017-09-20 22:02:18 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again 
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
 2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Belsima
8295742f81 More monitors! 2017-08-15 15:02:35 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
 2017-05-08 21:07:45 -04:00
Anewbe
a2c4c91789 Starts support for species robolimbs 2017-05-04 20:50:16 -05:00
Anewbe
fdee83cd40 Fixes the spare brand in the prosthetic fabricator 2017-04-29 15:00:26 -05:00
Cerebulon
09cea78cdd Adds Unbranded monitor head. 
https://gyazo.com/d37e65286cefb0d8611b8bd95747cc36
https://gyazo.com/e432d6a286c50f79f223725bcebd1733
https://gyazo.com/6f63caa3db135ff27ea5e9dcd77469f7
 2017-04-26 02:56:24 +01:00
Yoshax
1120d8c633 Fixes the color application on Vey-Med prosthetics 2017-03-29 00:42:53 +01:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
Neerti
7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph 
Readds HI prosthetics, corrects naming
 2017-03-21 00:27:00 -04:00
Anewbe
4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Anewbe
50b508f2d6 Adds Morpheus skull head 2017-03-07 22:34:42 -06:00