Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml

2018-05-10 13:48:20 -04:00

..

_random.dm

Splits up random.dm

2018-03-06 19:51:20 -06:00

guns_and_ammo.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

maintenance.dm

Changes to objects random

2018-03-23 23:03:15 -07:00

mapping.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

misc.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

mob.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

random_vr.dm

Remove combat medkit from station spawns

2018-02-26 15:26:27 -05:00

random.dm

Added fuzzy legcuffs

2018-04-13 04:56:16 +10:00

spacesuits.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00