Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

2017-01-20 23:43:35 +01:00

..

devices

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

mountable_frames

Fix light fixture frame progress bar

2016-10-15 12:47:38 +02:00

robot

Fully rips out cyborg sight modules

2017-01-10 00:32:11 -08:00

stacks

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-06 16:36:46 +01:00

weapons

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-20 23:43:35 +01:00

ashtray.dm

Mass replace

2016-07-07 19:34:02 -07:00

blueprints.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

bodybag.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

candle.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

changestone.dm

Mass replace

2016-07-07 19:34:02 -07:00

contraband.dm

random drugs

2016-05-05 22:50:46 -04:00

control_wand.dm

Better Destroys

2016-08-02 23:59:23 -04:00

crayons.dm

Graffiti prints are now hidden

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

dehy_carp.dm

…

documents.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

flag.dm

Fixes the flag sometimes not deleting right away.

2016-08-11 12:02:03 -07:00

latexballoon.dm

Better Destroys

2016-08-02 23:59:23 -04:00

misc.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

policetape.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

random_items.dm

Ports /tg/ Foam Force guns

2016-04-22 23:35:55 +02:00

shooting_range.dm

Mass replace

2016-07-07 19:34:02 -07:00

toys.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

2016-12-01 22:38:35 -05:00

trash.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00