shazbot194 234c8a78bc Merge conflict fix

2018-04-04 12:18:07 -08:00

..

devices

Merge remote-tracking branch 'upstream/master' into night_shift

2018-03-30 10:20:21 -07:00

mountable_frames

Mountables "rose" span removal

2017-08-19 01:33:23 -04:00

robot

Resets borg special vision when reset

2018-03-24 01:29:00 -05:00

stacks

makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps

2018-03-04 13:52:55 +05:00

weapons

Merge conflict fix

2018-04-04 12:18:07 -08:00

ashtray.dm

…

blueprints.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00

bodybag.dm

Removes Cryostasis Bags

2017-07-13 22:21:54 -04:00

candle.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00

cardboard_cutouts.dm

Fixes conflict

2017-06-10 10:18:05 +01:00

changestone.dm

…

contraband.dm

…

control_wand.dm

Revert "Buffs the HoP Door remote"

2017-08-28 21:35:18 -07:00

crayons.dm

Praise Honkmother! 📯 🤡 (Fixes mime and clown crayons not changing colour) (#7726)

2017-07-08 20:26:49 -04:00

dehy_carp.dm

…

documents.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00

flag.dm

Better way of handling icon_state code

2018-02-16 19:17:04 +00:00

latexballoon.dm

Object Embedding

2017-06-05 16:37:21 -04:00

misc.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00

policetape.dm

Merge remote-tracking branch 'upstream/master' into embedding

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

random_items.dm

Silver Slime Core and Random Reagent changes

2017-09-14 21:57:48 -04:00

shooting_range.dm

…

toys.dm

adds /mob/living/proc/attacked_by()

2018-03-04 13:52:52 +05:00

trash.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00