tigercat2000 c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber ...

Added Medical Marijuana Packets for the Psychologist

2018-03-13 04:58:04 -07:00

..

devices

Merge remote-tracking branch 'upstream/master' into disco-inferno

2018-01-29 20:56:44 -05:00

mountable_frames

Mountables "rose" span removal

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

robot

Fixes merge conflict

2017-11-28 22:39:01 -08:00

stacks

Merge pull request #8651 from uraniummeltdown/titaniummineral

2018-02-21 03:20:20 -05:00

weapons

Merge pull request #8733 from PigeonLord/nabber

2018-03-13 04:58:04 -07:00

ashtray.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

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

Garbage Collection and Code Cleanup

2017-03-27 18:37:44 -04:00

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

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

toys.dm

Toy dual eswords don't glow

2018-01-22 15:53:29 -06:00

trash.dm

Using Weight Defines

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