Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories ...

# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm

2019-01-26 02:17:22 -05:00

..

atmoalter

Pumps no longer remain on when the inserted tank is removed

2018-12-29 16:52:15 +00:00

camera

…

computer

Merge branch 'master' into GunsAndGunAccessories

2019-01-26 02:17:22 -05:00

doors

Some path normalization

2019-01-23 08:54:19 -06:00

embedded_controller

…

pipe

…

telecomms

Multilingualism

2018-11-24 00:22:05 -08:00

adv_med.dm

Fixes the whacking with a crowbar when you rotate the console.

2019-01-18 17:48:19 -06:00

ai_slipper.dm

…

alarm.dm

magic numbers

2018-11-16 15:32:49 +01:00

atmo_control.dm

multitool fixes

2018-11-20 14:21:25 +01:00

autolathe.dm

Updates Components Again

2018-11-02 16:23:46 -04:00

Beacon.dm

add teleporter, various misc changes

2018-12-07 16:29:48 +00:00

buttons.dm

…

cell_charger.dm

…

chiller.dm

…

cloning.dm

Devil game mode

2019-01-13 12:00:49 +01:00

constructable_frame.dm

Some path normalization

2019-01-23 08:54:19 -06:00

cryo.dm

…

cryopod.dm

…

dance_machine.dm

Merge branch 'master' into GunsAndGunAccessories

2019-01-26 02:17:22 -05:00

deployable.dm

…

door_control.dm

Removes the random description

2019-01-18 19:40:14 -06:00

doppler_array.dm

fix if statement error

2018-12-18 07:55:08 +00:00

dye_generator.dm

…

firealarm.dm

…

flasher.dm

…

floodlight.dm

…

Freezer.dm

…

gameboard.dm

…

guestpass.dm

…

hologram.dm

Merge branch 'master' into holopadSort

2018-12-08 23:12:14 -05:00

holosign.dm

…

igniter.dm

…

iv_drip.dm

No more attaching when incapacitated

2018-11-26 16:53:44 +02:00

lightswitch.dm

…

machinery.dm

multitool fixes

2018-11-20 14:21:25 +01:00

magnet.dm

Merge pull request #10185 from Mitchs98/moveresist

2018-12-28 20:53:07 +08:00

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

Added Syndicate Officer to the newscaster job blacklist

2018-12-24 05:14:03 +01:00

OpTable.dm

…

overview.dm

…

PDApainter.dm

Makes PDA painter moveable

2018-11-10 18:17:43 +00:00

poolcontroller.dm

Reduces Pool Temp Spam

2018-10-31 21:00:42 -05:00

portable_tag_turret.dm

Refactor a few small things to make my research level parser work and make the code less odd

2018-12-30 15:18:00 +01:00

portable_turret.dm

Merge branch 'master' into GunsAndGunAccessories

2019-01-26 02:17:22 -05:00

quantum_pad.dm

…

recharger.dm

Some path normalization

2019-01-23 08:54:19 -06:00

rechargestation.dm

…

recycler.dm

Updates Components Again

2018-11-02 16:23:46 -04:00

requests_console.dm

…

shieldgen.dm

why was this a thing???

2019-01-12 18:47:31 -06:00

Sleeper.dm

…

slotmachine.dm

…

snow_machine.dm

minor tweaks

2018-12-16 13:24:48 +00:00

spaceheater.dm

…

status_display.dm

magic numbers

2018-11-16 15:32:49 +01:00

suit_storage_unit.dm

replaced SSUs with unsecure version on maint request, removed SSU from telecoms and medical storage.

2019-01-22 02:06:00 +01:00

supply_display.dm

…

syndicatebeacon.dm

…

syndicatebomb.dm

changes the amount of plasteel on bomb deconstruction

2019-01-22 01:10:01 +00:00

teleporter.dm

add teleporter, various misc changes

2018-12-07 16:29:48 +00:00

transformer.dm

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

2018-11-05 15:16:07 -08:00

turntable.dm

…

turret_control.dm

…

vending.dm

Add clown wiz outfit to magivend

2018-12-30 18:03:48 +00:00

washing_machine.dm

Adds a lot of other machines

2018-11-10 19:22:23 +00:00

wishgranter.dm

super move

2018-12-12 00:31:19 -05:00