deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

actions

Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes

2017-10-13 19:09:45 -05:00

antagonists

Fixes some broken random events (#33345)

2017-12-08 10:34:50 -06:00

components

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

diseases

Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858

2017-12-04 21:57:29 +00:00

helper_datums

Merge pull request #33109 from ShizCalev/camera-teleport

2017-11-28 06:29:05 -06:00

looping_sounds

Merge pull request #33251 from tgstation/Cyberboss-patch-3

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

martial

Fixes bartender suit having an adjust state

2017-11-22 12:40:32 -06:00

mutations

Update hulk.dm

2017-11-26 21:29:20 -05:00

ruins

fixes spelling and stuff (#32531)

2017-11-09 11:04:50 -06:00

status_effects

Moves projectile processing to a subsystem

2017-10-15 21:51:24 -05:00

weather

Being buckled to a bed now saves you from "the floor is lava" (#33204)

2017-12-03 13:16:37 -06:00

wires

Prevents the PA wires from being EMP'd (#33199)

2017-12-02 09:43:42 -06:00

action.dm

Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes

2017-10-13 19:09:45 -05:00

ai_laws.dm

Merge branch 'master' into upstream-merge-31140

2017-10-01 02:53:18 -04:00

beam.dm

Crash to timers and INFINITY check to beams. (#33219)

2017-12-03 12:45:27 -06:00

browser.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

callback.dm

Merge pull request #32130 from Cyberboss/call_security

2017-10-27 17:33:42 -05:00

cinematic.dm

Refactors cinematics.

2017-09-26 04:20:59 -05:00

dash_weapon.dm

Ports dash weapons to the dash datum

2017-10-03 18:11:42 -05:00

datacore.dm

Roundstart species pref fixes/removes redundant species config

2017-10-26 12:00:56 -05:00

datum.dm

Merge branch 'master' into upstream-merge-32504

2017-11-12 23:11:53 -06:00

datumvars.dm

Fixes VV Make Space Ninja verb (#32982)

2017-11-28 06:27:45 -06:00

dna.dm

Allows species to be blocked from ever being roundstart, can now choose your Halloween species

2017-10-20 10:11:35 -05:00

dog_fashion.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

emotes.dm

Fixes emotes not checking the right turf (or any turf for that matter) (#31735)

2017-10-15 19:41:01 -05:00

explosion.dm

Merge pull request #32424 from lzimann/zlevelcapmultiplier

2017-11-05 15:13:11 -06:00

forced_movement.dm

Update forced_movement.dm

2017-10-01 14:43:06 -05:00

holocall.dm

Holorecord disks.

2017-12-04 05:14:13 -06:00

hud.dm

Added bot path data huds

2017-11-28 06:28:40 -06:00

map_config.dm

Fixes allow_custom_shuttles default

2017-10-30 15:21:11 -05:00

martial.dm

Makes martial arts not be deleted (#1931)

2017-07-07 10:35:40 -07:00

mind.dm

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

mutable_appearance.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

mutations.dm

Update mutations.dm

2017-11-26 21:28:35 -05:00

outfit.dm

Merge pull request #31074 from pubby/ninjaoutfit

2017-09-28 21:53:05 -05:00

profiling.dm

Line by line profiling system

2017-10-27 13:10:21 -05:00

progressbar.dm

Removes old debug text

2017-09-21 06:30:11 -05:00

radiation_wave.dm

Some minor contamination fixes

2017-10-31 15:30:53 -05:00

recipe.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

ruins.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

saymode.dm

[s] Fix changeling chat (#33305)

2017-12-05 13:43:03 -06:00

shuttles.dm

Adds disco inferno shuttle. (#33230)

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

soullink.dm

[MIRROR] Devil refactor+small revamp (#887)

2017-05-18 09:06:01 -05:00

spawners_menu.dm

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

uplink_items.dm

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

uplink_purchase_log.dm

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

verbs.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

votablemap.dm

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

weakrefs.dm

Update weakrefs.dm

2017-11-14 13:06:53 -06:00

world_topic.dm

Adds round ID to status topic (#32976)

2017-11-22 12:41:44 -06:00