jughu 4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker

2017-10-14 18:01:05 -05:00

..

effects

Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570

2017-10-14 15:37:17 -04:00

items

Merge pull request #3380 from Citadel-Station-13/upstream-merge-31454

2017-10-14 15:38:01 -04:00

structures

Adds petcollars to the cmo, captain, and bartender's locker

2017-10-14 18:01:05 -05:00

buckling.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

empulse.dm

…

items.dm

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

obj_defense.dm

Stops airlocks from getting harddeleted, also fixes an unrelated runtime (#31412)

2017-10-09 08:56:16 -05:00

objs.dm

Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes

2017-10-13 19:09:45 -05:00

radiation.dm

…

structures.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

weapons.dm

…