variableundefined 3f060e034e Merge pull request #10253 from Kyep/cc_contraband ...

CC/Admin Outfits Update

2018-11-19 11:05:12 +08:00

..

area

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

dna

SSoverlays for human icons, mostly works

2018-11-08 20:24:22 -08:00

gamemodes

Merge pull request #10253 from Kyep/cc_contraband

2018-11-19 11:05:12 +08:00

jobs

gives NTUO centcom access, fixes typo in access.dm, adds mindshield to specops arm implant

2018-11-17 17:28:31 -08:00

machinery

Merge pull request #10242 from Certhic/radiochannels

2018-11-16 23:51:53 +08:00

magic

…

mecha

Merge remote-tracking branch 'upstream/master' into updateicons

2018-11-08 20:24:48 -08:00

objects

Merge pull request #10253 from Kyep/cc_contraband

2018-11-19 11:05:12 +08:00

turfs

Merge pull request #9719 from SamHPurp/smoothing-improvements

2018-10-21 07:41:47 +08:00

verbs

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

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

alternate_appearance.dm

…

asteroid.dm

…

atoms_movable.dm

Roll the damn changes back, init works now

2018-10-23 17:48:22 -07:00

atoms.dm

Fix atom init again

2018-10-23 18:48:56 -07: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 pull request #9388 from FreeStylaLT/crunch

2018-10-15 12:52:43 +08:00

world.dm

Resolves conflicts.

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