LetterJay 8c1dcd9429 Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986 ...

[MIRROR] You can now hide grenades in plushies

2017-10-30 23:33:16 -04:00

..

circuitboards

Adds the Chemistry Smoke Machine (#30920)

2017-10-10 13:13:38 -05:00

devices

Adds force to items that really should hurt when hit by (#32200)

2017-10-29 18:49:48 -05:00

grenades

Update grenade.dm

2017-10-30 17:32:08 -05:00

implants

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

melee

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

robot

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

stacks

Greyscale cables

2017-10-25 21:46:57 -05:00

storage

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

tanks

Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00

AI_modules.dm

Changed OneHuman to OneCrew lawset (#3172)

2017-10-06 11:36:52 -07:00

airlock_painter.dm

Update airlock_painter.dm

2017-10-16 06:12:45 -05:00

apc_frame.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

blueprints.dm

…

body_egg.dm

…

bodybag.dm

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

candle.dm

…

cardboard_cutouts.dm

Fixes foam darts on cardboard cutouts and shooting range targets (#31579)

2017-10-12 15:46:05 -05:00

cards_ids.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

charter.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

chrono_eraser.dm

Minor refactor of how gas IDs are handled

2017-10-12 00:30:09 -05:00

cigs_lighters.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

clown_items.dm

Update clown_items.dm

2017-10-27 23:56:37 -05:00

clown.dm

…

control_wand.dm

…

cosmetics.dm

[MIRROR] Fixes shaving headless mobs (#2890)

2017-09-22 22:31:54 -05:00

courtroom.dm

…

crayons.dm

Roundstart species pref fixes/removes redundant species config

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

defib.dm

Fixes defib ghost prompt (#32019)

2017-10-25 23:42:10 -05:00

dehy_carp.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

dice.dm

Update dice.dm

2017-09-19 06:35:36 -05:00

dna_injector.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

documents.dm

…

eightball.dm

Self replacement fix (#30834)

2017-09-28 11:08:02 -05:00

extinguisher.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

flamethrower.dm

Minor refactor of how gas IDs are handled

2017-10-12 00:30:09 -05:00

gift.dm

…

handcuffs.dm

Greyscale cables

2017-10-25 21:46:57 -05:00

his_grace.dm

…

holosign_creator.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

holy_weapons.dm

Fixes godhand having no inhand sprite (#31744)

2017-10-16 14:34:11 -05:00

inducer.dm

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

kitchen.dm

…

latexballoon.dm

…

manuals.dm

[MIRROR] [Review Again] Updates the cloning manual (#3663)

2017-10-28 01:19:38 -07:00

miscellaneous.dm

…

mop.dm

Makes thermite a component

2017-10-27 17:36:38 -05:00

paint.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

paiwire.dm

Update paiwire.dm

2017-10-07 22:50:21 -05:00

pinpointer.dm

…

plushes.dm

You can now hide grenades in plushies

2017-10-30 14:34:01 -05:00

pneumaticCannon.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

powerfist.dm

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

RCD.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

RCL.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

religion.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

RPD.dm

Allows RPD to place pipes on catwalks/girders (#32141)

2017-10-28 12:00:23 -05:00

RSF.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

scrolls.dm

…

sharpener.dm

Adds force to items that really should hurt when hit by (#32200)

2017-10-29 18:49:48 -05:00

shields.dm

…

shooting_range.dm

Fixes foam darts on cardboard cutouts and shooting range targets (#31579)

2017-10-12 15:46:05 -05:00

signs.dm

Adds desc to things lacking them.

2017-10-01 15:07:37 -05:00

singularityhammer.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

stunbaton.dm

Update stunbaton.dm

2017-10-23 13:17:35 -05:00

taster.dm

…

teleportation.dm

Update teleportation.dm

2017-10-13 22:31:10 -05:00

teleprod.dm

…

theft_tools.dm

Assmos part 1, #2

2017-10-26 23:12:27 -05:00

tools.dm

Update tools.dm

2017-10-29 22:41:56 -05:00

toys.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

trash.dm

…

twohanded.dm

Alt-clicking descriptions when examining

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

vending_items.dm

Adds desc to things lacking them.

2017-10-01 15:07:37 -05:00

weaponry.dm

--no-edit

2017-10-25 23:38:24 -05:00