tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

2018-03-22 15:35:12 -07:00

..

grenades

Merge pull request #8430 from Fox-McCloud/ied-buff

2018-02-19 21:45:05 -08:00

implants

stops antagbanned players being mindslaved

2017-10-09 21:46:38 -07:00

melee

adds /mob/living/proc/attacked_by()

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

storage

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

tanks

moves var/list/armor to /obj level

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

AI_modules.dm

…

alien_specific.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

bee_briefcase.dm

makes the bee-case sound local

2017-08-24 23:58:24 +01:00

cards_ids.dm

…

cash.dm

…

caution.dm

…

chrono_eraser.dm

…

cigs.dm

refactor match and lighter code to use procs, some code cleanup

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

clown_items.dm

…

cosmetics.dm

guess i spaced out during this one

2017-11-02 11:20:37 +08:00

courtroom.dm

…

defib.dm

bugfix

2017-08-29 15:48:21 +01:00

dice.dm

…

disks.dm

…

dna_injector.dm

…

dnascrambler.dm

…

explosives.dm

…

extinguisher.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

fireworks.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

flamethrower.dm

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00

garrote.dm

Stop assuming gender.

2017-10-22 15:03:55 +08:00

gift_wrappaper.dm

…

handcuffs.dm

adds some helper procs

2017-10-26 08:09:08 -04:00

highlander_swords.dm

…

holosign.dm

moves var/list/armor to /obj level

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

holy_weapons.dm

Splits janitor/paranormal gear based on ERT level

2017-10-18 17:36:02 -07:00

kitchen.dm

The Utensil of the future!

2018-01-23 18:45:55 -06:00

legcuffs.dm

Merge pull request #8430 from Fox-McCloud/ied-buff

2018-02-19 21:45:05 -08:00

lighters.dm

fix incorrect match path

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

manuals.dm

Manuals.dm fix

2018-02-25 20:02:48 -05:00

misc.dm

…

mop.dm

…

paint.dm

paint bucket fix

2017-09-09 20:12:17 +01:00

paiwire.dm

…

pneumaticCannon.dm

…

power_cells.dm

Nerf slime cell charge rate to 500, from 1500

2017-10-03 20:42:21 +08:00

powerfist.dm

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00

RCD.dm

move door_assembly types to new door_assembly_types.dm

2018-01-22 21:54:11 +05:00

RCL.dm

…

rpd.dm

Removes some obsolete code

2018-03-12 19:20:15 +00:00

RSF.dm

Fixes merge conflict

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

scissors.dm

…

scrolls.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

shards.dm

moves var/list/armor to /obj level

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

shields.dm

moves var/list/armor to /obj level

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

signs.dm

…

soap.dm

…

staff.dm

…

stock_parts.dm

…

stunbaton.dm

i should of kept it as it was huh

2018-03-20 19:25:43 -04:00

swords_axes_etc.dm

adds /mob/living/proc/attacked_by()

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

syndie_uplink.dm

…

tape.dm

…

teleportation.dm

moves var/list/armor to /obj level

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

teleprod.dm

…

tools.dm

make power tools and abductor tools use titanium

2018-02-21 11:09:47 +05:00

twohanded.dm

moves var/list/armor to /obj level

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

vending_items.dm

Coffee Mugs and Vendor Change

2018-01-22 22:46:03 -05:00

weaponry.dm

…

whetstone.dm

change whetstone notice spans to warning

2017-09-30 22:51:19 +04:00

wires.dm

…