alberyk 8c1d2a7cde Merge branch 'master' into final_away_maps_additions ...

# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm

2022-04-04 19:47:58 -03:00

..

circuitboards

Merge branch 'master' into final_away_maps_additions

2022-04-04 19:47:58 -03:00

grenades

Buffs frag grenades. (#12542)

2021-10-25 12:13:10 +02:00

implants

Late Miscellaneous Init speedup (#13304)

2022-03-05 13:00:51 +01:00

material

Grab Stuff (#12731)

2021-12-19 22:10:40 +01:00

melee

Equip-O-Matic (#12641)

2021-10-25 12:12:46 +02:00

storage

Allow AltClick to remove ID from wallets (#13229)

2022-02-23 19:35:40 +01:00

tanks

Merge branch 'master' into final_away_maps_additions

2022-04-04 19:47:58 -03:00

AI_modules.dm

…

autopsy.dm

…

candle.dm

Better Screen Tints (#12155)

2021-07-31 12:49:24 +02:00

cards_ids_syndicate.dm

Syndicate ID & Crew Announcement can now spoof faction (#13206)

2022-02-18 12:13:23 +01:00

cards_ids.dm

bar and old aurora

2022-04-01 20:25:28 -03:00

cards_tech_support.dm

…

chaplain_items.dm

fixes urns not being able to pick up ashes (#12777)

2021-11-21 15:32:31 -03:00

chewables.dm

…

cigs_lighters.dm

Fixes cigarette slot placement when extinguished (#12589)

2021-10-07 17:09:55 -03:00

cloaking_device.dm

…

cosmetics.dm

…

dice.dm

Weighted die fixes (#13372)

2022-03-12 14:17:55 +01:00

dna_injector.dm

…

ecigs.dm

Tajara and Unathi Smoking Icon Tweaks (#13214)

2022-03-01 17:09:40 +01:00

explosives.dm

…

extinguisher.dm

fixes chair movement with mobs (#12852)

2021-12-19 05:10:00 +01:00

flamethrower.dm

Removes several sounds with incompatible license (#12263)

2021-08-01 17:22:43 +02:00

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Bulwark Fixes Again (#12678)

2021-10-25 15:04:38 -03:00

hydroponics.dm

…

improvised_components.dm

Tripwire Trap and Wired Rod Colors (#12090)

2021-07-03 18:48:21 -03:00

ipc_scanner.dm

…

landmines.dm

…

manuals.dm

All jobs

2021-09-23 23:07:28 -03:00

mop.dm

…

neutralizer.dm

…

paint.dm

…

paiwire.dm

…

policetape.dm

Synthetic Smörgåsbord (#12417)

2021-09-06 22:47:27 +02:00

power_cells.dm

Ports ecigs (#12038)

2021-07-16 12:53:32 -03:00

research_slip.dm

…

RFD.dm

RFD-C's Can Now Build Flooring on Open Space (#12456)

2021-09-07 12:11:53 +02:00

shields.dm

…

soap.dm

Decapitalizes soap (#12602)

2021-10-11 20:10:33 -03:00

stunbaton.dm

Tripwire Trap and Wired Rod Colors (#12090)

2021-07-03 18:48:21 -03:00

surgery_tools.dm

Merge branch 'master' into final_away_maps_additions

2022-04-04 19:47:58 -03:00

swords_axes_etc.dm

…

syndie.dm

Pen Charge (#12144)

2021-07-09 13:37:07 -03:00

tape.dm

…

teleportation.dm

Teleport pads are now controlled directly by the teleport control computer program.

2022-03-16 15:20:58 +00:00

tether.dm

…

thermal_drill.dm

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

tools.dm

Add hammers (#12505)

2021-10-11 22:44:59 -03:00

towel.dm

Fixes the worn towel by the Bulwark (#12669)

2021-10-21 22:23:04 -03:00

traps.dm

Overmap exoplanet generation, ported from Bay. (#12362)

2022-01-17 22:16:48 -03:00

vaurca_items.dm

Autodrobe doesn't remove Vaurca mandible mask from face (#13367)

2022-03-12 22:23:15 +01:00

weaponry.dm

…