variableundefined 24661d2c44 Merge pull request #10833 from Kyep/ends_geezer_cheat ...

Removes age-based weighting for head/captain job selection

2019-02-08 19:36:56 +08:00

..

area

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

2019-01-29 17:42:39 -05:00

dna

Merge pull request #10759 from datlo/garbledwingdings

2019-02-01 10:32:30 +08:00

gamemodes

Update talisman.dm

2019-02-07 12:22:24 +02:00

jobs

Merge pull request #10833 from Kyep/ends_geezer_cheat

2019-02-08 19:36:56 +08:00

machinery

Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light

2019-02-02 22:53:46 -06:00

magic

…

mecha

DMI File Casing Rename

2019-01-30 20:09:39 -05:00

objects

Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light

2019-02-02 22:53:46 -06:00

turfs

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

2019-01-29 17:42:39 -05:00

verbs

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

alternate_appearance.dm

…

asteroid.dm

Removing the mass spectrometer and replacing it with the reagent scanner.

2018-11-23 19:48:18 -05:00

atoms_movable.dm

mobs on helpful intent no longer push pulled structures or players pulling structures, structure.dm follows mob.dm's issilicon for isstructure as per contributing no hacky code, pulledby now set to null when stop_pulling() is called, thus they actually stop pulling

2019-01-29 21:09:53 -08:00

atoms.dm

Merge pull request #10185 from Mitchs98/moveresist

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

data_huds.dm

Cling regenerative stasis now appears as if the cling is dead on the med HUDs

2018-11-04 17:16:31 +01:00

shuttle_engines.dm

…

sound.dm

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

2019-01-29 17:42:39 -05:00

world.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00