Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things ...

# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm

2017-04-01 12:45:45 -05:00

..

circuitboards

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

grenades

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

implants

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

material

Merge pull request #3158 from Anewbe/fbp_screams

2017-03-28 20:03:01 -05:00

melee

Changes the way embedding works

2016-10-11 21:29:49 -05:00

storage

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things

2017-04-01 12:45:45 -05:00

tanks

Fixes phoron sprites. (#3100)

2017-03-20 19:31:42 -05:00

AI_modules.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

autopsy.dm

Added in-hand sprites to most item lacking them from the Medical department.

2017-03-26 07:04:01 +01:00

candle.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

cards_ids_syndicate.dm

…

cards_ids.dm

Replaces Station Administrator

2016-10-06 22:38:02 -04:00

cigs_lighters.dm

Fixes a thing

2017-03-28 20:17:35 -05:00

clown_items.dm

…

cosmetics.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

dice.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

dna_injector.dm

Replaces Station Administrator

2016-10-06 22:38:02 -04:00

explosives.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

extinguisher.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

flamethrower.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

game_kit.dm

…

gift_wrappaper.dm

Pulling & Size Fixes

2016-09-24 16:18:32 -04:00

handcuffs.dm

Kills telecuffs

2016-10-23 21:31:12 -05:00

hydroponics.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

improvised_components.dm

Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand.

2017-03-27 21:24:47 -05:00

manuals.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

mop_deploy.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

mop.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

paint.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

paiwire.dm

…

policetape.dm

Merge pull request #2807 from MagmaRam/door_tape

2016-11-22 21:57:11 -06:00

power_cells.dm

Fixes device cells

2016-10-16 13:42:16 -05:00

RCD.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

RSF.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

scrolls.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

shields.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

stunbaton.dm

Device Cell QOL

2017-03-29 13:58:35 -05:00

surgery_tools.dm

Fixes descriptions on 3 surgical tools

2017-03-02 14:08:13 -05:00

swords_axes_etc.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

syndie.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

tape.dm

Should fix the tape thing.

2016-10-17 16:52:20 -05:00

teleportation.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

tools.dm

Adds a bunch of things to cargo

2017-03-31 00:23:27 -05:00

towels.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

traps.dm

Sorta implements armor soak, very WIP

2017-03-10 20:26:37 -06:00

trays.dm

Fix two extra robust bugs

2017-03-03 16:25:53 -05:00

weaponry.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

weldbackpack.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00