kingofkosmos 228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1 ...

# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm

2019-10-13 15:21:17 +03:00

..

effects

stray /obj/effect/turf_decal/trimline/brown/filled/end -> /obj/effect/turf_decal/trimline/neutral/filled/end

2019-10-08 23:09:04 +01:00

items

Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1

2019-10-13 15:21:17 +03:00

structures

Removes excess spaces in messages.

2019-10-13 14:36:43 +03:00

buckling.dm

Fixes borg buckling+searching on harm intent (#46622)

2019-09-30 21:39:25 +02:00

empulse.dm

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

items.dm

Removes a bunch of var/ in procs (#46946)

2019-10-10 04:20:27 -07:00

obj_defense.dm

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)

2019-10-08 11:06:02 -04:00

objs.dm

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)

2019-10-08 11:06:02 -04:00

structures.dm

Pulling lockers now slow you down. (#46216)

2019-09-02 18:32:54 -07:00