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

..

circuitboards

Make gas turbine constructable and operational

2018-02-22 15:43:38 -05:00

grenades

Flashbangs no longer Stun()

2018-02-22 02:20:25 -06:00

id cards

Merge pull request #3058 from VOREStation/aro-joinspeed

2018-02-17 23:41:05 -06:00

implants

POLARIS: Fix several Destroy()s

2018-02-20 10:00:23 -05:00

material

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

melee

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

storage

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

tanks

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-02-18 00:25:36 -06:00

AI_modules.dm

One Crew Member

2017-11-26 12:28:59 -05:00

autopsy.dm

…

bones.dm

Adds decorative bones and bone loot pile (#4800)

2018-02-12 22:13:47 -06:00

candle.dm

Stop candles from messaging the universe when they light.

2018-02-22 10:17:49 -05:00

cards_ids_vr.dm

…

cigs_lighters.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00

clown_items.dm

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

cosmetics.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

handcuffs.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

hydroponics.dm

…

improvised_components.dm

…

manuals_vr.dm

Revert "Ace didn't write this version"

2017-11-18 10:57:36 -05:00

manuals.dm

Added operating manual book for Tesla

2018-01-19 17:26:45 -05:00

mop_deploy.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

Polaris sync

2017-12-21 04:01:07 -05:00

policetape.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

power_cells.dm

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

RCD.dm

Adds Missing Ceiling Overlay + Fixes Space on Roof

2018-01-22 14:27:19 -05:00

RSF.dm

…

scrolls.dm

…

shields_vr.dm

AwooCosplayCrate

2018-02-08 12:57:18 -06:00

shields.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

stunbaton.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

surgery_tools.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

swords_axes_etc.dm

…

syndie.dm

Tones down package bombs

2018-02-19 15:45:21 -06:00

tape.dm

Makes Tape work on Nerds, and people without eyes. (#4791)

2018-02-11 19:02:22 -08:00

teleportation.dm

Removes Hardcoded Z-check on Handteles

2018-01-01 06:41:17 -05:00

tools.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

towels.dm

…

traps.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

trays.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

weaponry.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

weldbackpack.dm

Adds a mounted welder to the welderpacks in engineering.

2017-10-31 20:07:14 -07:00