Neerti
d5438dc36d
Fixes two bugs.
2017-03-03 10:09:45 -05:00
Neerti
0f781e36a7
Adds Multi-Z Test Map
2017-03-03 09:40:34 -05:00
Arokha Sieyes
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
Anewbe
25b925f04c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
...
# Conflicts:
# maps/northern_star/polaris-1.dmm
# maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
bb2adf1290
Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
...
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Anewbe
8875c5ce1f
Merge pull request #3027 from VOREStation/implanters
...
Make implanters able to be created
2017-02-28 20:26:48 -06:00
Arokha Sieyes
50a8b94294
Make implanters able to be created
...
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
Neerti
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Leshana
3781494933
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-23 18:25:37 -05:00
Anewbe
9d6a11e17d
Readds HI prosthetics, corrects naming
2017-02-23 14:41:24 -06:00
Leshana
dbd3622588
Enhances the Paper Shredder
...
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Anewbe
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
Arokha Sieyes
e4557b0724
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-14 20:29:57 -05:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
Anewbe
3833a404c7
Antag announcement papertrail
2017-02-05 01:13:07 -06:00
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
Dhaeleena
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03:00
Anewbe
83db0cc38f
Medical tweaks
2017-01-23 23:43:44 -06:00
Anewbe
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
Anewbe
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
Anewbe
d53cfc4773
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
...
# Conflicts:
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
# icons/mob/human_face.dmi
# icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
cedf6b41a0
Fixes the longjohn shirt sprite
2017-01-16 21:20:49 -06:00
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05:00
Anewbe
a4471556b1
Ports a bunch of Baystation's underclothes and hair
2017-01-11 19:12:49 -06:00
Neerti
e45fb628f4
Adds Telecomms Logging to EPv2
...
The Exonet Node now has a log window, showing all successful message transmissions that pass through it. Each line contains information about the origin address, target address, the message type, and the contents of the message.
Changes the documentation for some procs to be more clear on what they're actually doing.
2017-01-07 13:21:03 -05:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
killer653
9c359cb202
Polaris sync
2016-12-27 08:21:55 -05:00
MagmaRam
aa0ae1c676
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fifty_stacks
2016-12-18 13:43:20 -06:00
Anewbe
a45b1ab846
Merge pull request #2861 from MagmaRam/defibcrate
...
Adds a crate with defibrilators for 30 points
2016-12-18 13:40:42 -06:00
MagmaRam
190a2bc70c
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
...
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
MagmaRam
d3be058c5d
Adds a crate with defibrilators for 30 points
2016-12-17 09:46:05 -06:00
Neerti
68b1a3e355
Vending machines now correctly throw products
2016-12-17 03:30:14 -05:00
killer653
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05:00
ForFoxSake
451f48e621
Enable overriding of the underwear icon file.
2016-12-09 13:30:38 +00: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
7d532f573e
Merge pull request #2751 from Kholdstare34/outbox
...
Clothing additions, minor clothing tweaks, and undershirts
2016-11-16 17:29:36 -06:00
Anewbe
be4aa63263
AP bullets
2016-11-15 19:50:28 -06:00
Kholdstare34
f37251496e
Adds several feminine undershirts, tweaks the warden and HoS jumpskirt to bring them in line with the other departmental jumpskirts, and adds white short shorts and a denim skirt.
2016-11-15 19:08:27 -06:00
Anewbe
189a9a4329
Brand disks now come in their own crates, prices increased
2016-11-13 16:03:03 -06:00
Anewbe
940ecb2b80
Surplus crates will no longer make more surplus crates
2016-11-07 21:07:57 -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
Neerti
7dadc5f6f9
Merge pull request #2658 from Anewbe/waistcoat
...
Waistcoats are accessories
2016-10-24 19:33:12 -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
PapaDrow
560edb9687
Adds striped underoos in the same pattern as the striped socks, as it says on the tin. Should support recolouring.
2016-10-19 18:36:56 -04: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
