Artur c41d2e78be Conflicts!!!

2020-06-22 17:39:24 +03:00

..

actions

fixes ninja adrenals not being able to be activated when stamcritted because that is incredibly bad (#12312)

2020-05-20 18:07:29 +02:00

brain_damage

haha whew

2020-06-17 21:32:10 -07:00

components

Conflicts!!!

2020-06-22 17:39:24 +03:00

diseases

haha whew

2020-06-17 21:32:10 -07:00

elements

Removing now unused old embed behavior

2020-06-20 00:15:52 +02:00

helper_datums

ok

2020-05-10 15:05:46 -07:00

looping_sounds

…

martial

let's finish parrying

2020-05-28 04:55:43 -07:00

materials

Porting updates related to material datums. (#12317)

2020-05-25 14:21:00 -07:00

mood_events

Porting updates related to material datums. (#12317)

2020-05-25 14:21:00 -07:00

mutations

Conflicts!!!

2020-06-22 17:39:24 +03:00

ruins

Porting updates related to material datums. (#12317)

2020-05-25 14:21:00 -07:00

skills

Fixing just a couple issues. (#12417)

2020-06-02 15:30:22 -07:00

status_effects

ports some events

2020-06-15 20:22:40 +01:00

traits

Porting updates related to material datums. (#12317)

2020-05-25 14:21:00 -07:00

weather

outdoor lights, rad protection

2020-05-12 17:13:23 -05:00

wires

Merge remote-tracking branch 'upstream/master' into TGUI-3.0

2020-05-30 18:52:02 +03:00

action.dm

Revamped the paper wizard robes. (#12348)

2020-05-27 18:01:22 -07:00

ai_laws.dm

…

armor.dm

…

beam.dm

…

browser.dm

asset cache + better minimaps

2020-05-31 16:15:09 +08:00

callback.dm

…

chatmessage.dm

ok

2020-06-07 21:27:36 -07:00

cinematic.dm

haha whew

2020-06-17 21:32:10 -07:00

dash_weapon.dm

…

datacore.dm

…

datum.dm

…

datumvars.dm

…

dna.dm

Compile

2020-06-01 10:26:48 +03:00

dog_fashion.dm

Fixing missing clothing icons etc.

2020-06-02 17:43:31 +02:00

emotes.dm

…

ert.dm

…

explosion.dm

i'm salty (#12181)

2020-05-10 21:33:56 +02:00

forced_movement.dm

…

holocall.dm

…

hud.dm

final fixes

2020-06-16 23:47:22 +01:00

mind.dm

tiny bit of better performance

2020-06-08 21:29:29 +02:00

mutable_appearance.dm

…

numbered_display.dm

…

outfit.dm

…

position_point_vector.dm

fixes

2020-05-12 07:38:52 -07:00

profiling.dm

…

progressbar.dm

…

radiation_wave.dm

…

recipe.dm

…

ruins.dm

…

saymode.dm

…

shuttles.dm

Conflicts!!!

2020-06-22 17:39:24 +03:00

soullink.dm

…

spawners_menu.dm

…

tgs_event_handler.dm

updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) (#12364)

2020-05-27 17:58:43 -07:00

verbs.dm

…

weakrefs.dm

…

world_topic.dm

…