cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,830 Commits 8 Branches 26 Tags
2c234591c8d8a7059bcd35d00f63e39ecdc2fcbc
Commit Graph

37 Commits

Author SHA1 Message Date
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
woodratt
454e6870d9 1.6.3 Ports of Bay's suit clothing 
- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.
 2016-11-24 19:19:26 -08:00
Anewbe
5397b162c8 Merge pull request #2777 from SpadesNeil/crate-fix 
Fixes stupid naming of weapon crates
 2016-11-19 12:03:00 -06:00
Spades
fbfeba71c3 Fixed 2016-11-19 12:34:42 -05:00
Spades
5bf58cda40 Fixes stupid naming of laser weapons crate 
This was confusing and dumb. Now it's not.
 2016-11-19 11:39:41 -05:00
Anewbe
189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
 2016-11-04 15:42:32 -04:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
 2016-10-20 21:24:07 -04:00
Anewbe
510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
Anewbe
ced74308e9 Fixes some Cargo crate issues 2016-10-16 13:21:05 -05:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Anewbe
6ba07bbb45 Merge pull request #2565 from SpadesNeil/supply-crates 
Fixes supplypacks.dm invalid group
 2016-10-02 12:29:36 -05:00
Spades
05c6be93ec Operations doesn't exist 2016-09-30 02:33:30 -04:00
Anewbe
9092c11ce6 Removes parapen from SpecOps crate 2016-09-25 21:16:07 -05:00
Spades
2a1d84fec6 Fixes contraband maybe for real this time (#588) 
* Fixes contraband crate

* Fixes contraband maybe for real this time

* wrong name
 2016-09-25 18:43:26 -04:00
Spades
5c7f6f9863 Fixes contraband crate (#580) 2016-09-23 00:56:52 -04:00
Cameron653
b29deb61d0 Adds bird mobs (#563) 
* Adds birbs

Sprites from Goonstation

* micros should be ate

* Forgot to remove editing lines

* Adds a bird crate to cargo.

Since crates can only have one animal in them at any given time, I had
to make a hack to make it spawn multiple birds at once.

* Update hydroponics_vr.dm
 2016-09-18 23:18:39 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
Yoshax
75630d8e92 Corrects a path 2016-07-25 14:56:19 +01:00
Yoshax
eeb5e66c75 Adds orderable tank transfer valves (not actual bombs) to the cargo Phoron crate 2016-07-25 14:53:55 +01:00
Anewbe
56f9e63c64 Adds pockets to the HoS and Warden coats 2016-07-24 15:55:54 -05:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
Yoshax
fcf34eb54b Puts a couple of crates into the right file 2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71 Converts the empty box supply crate into a shipping supplies crate 2016-07-23 20:05:59 +01:00
Cameron653
a84afa6e99 Fixes a typo preventing field gens from being bought. 2016-07-21 17:03:15 -04:00
Mark9013100
8e7b2e8fe0 Removes the HoS trench from the security uniform crate 2016-07-19 21:45:44 -04:00
Yoshax
04e664ca36 Makes cargo datums and shuttle use fifty stacks for material, removes snowflake amount code and var 2016-07-10 03:49:16 +01:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
Yoshax
7baa3face9 Adjusts and attempts to normalize cargo costs 2016-06-27 19:32:46 +01:00
Yoshax
0eab5e4b80 Adds missing cargo categories 2016-06-20 18:47:24 +01:00
Yoshax
6cb89d4d77 Makes costumes category not borked 2016-06-16 18:50:00 +01:00
Arokha Sieyes
3809e30a07 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/datums/supplypacks/science.dm
 2016-06-14 21:09:38 -04:00
Arokha Sieyes
cb65295059 Fixes issues with update: 
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
 2016-06-14 15:01:37 -04:00
Yoshax
9e79e35964 Makes science group not security 2016-06-13 22:55:30 +01:00
Yoshax
0cbade2d98 Adjusts cargo categories 2016-06-11 20:18:53 +01:00
Datraen
6984008bca Splits supplypacks.dm into categorized files, adds subtyping. 2016-06-11 12:13:40 -04:00