Armhulen
c516404175
Fixes tendril possession ( #31705 )
2017-10-15 11:33:24 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
LetterJay
9af6ffa946
Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
...
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
Jordan Brown
1604f8b1d3
Datumizes world/Topic ( #31543 )
...
* Datumizes world/Topic
* active_players requires comms_key
2017-10-12 00:28:27 -05:00
deathride58
bd18903e13
eh it works
2017-10-11 18:03:58 -04:00
deathride58
5d0853e16a
Crew objective/miscreant system tweaks ( #3213 )
...
* Loadsa tweaks
* adds miscreant pref, other fixes
* fixes runtime
* fixes compiling errors for REAL now hopefully
* HOPEFULLY fixes compiling errors
* COMPILE!
2017-10-08 10:05:40 -07:00
deathride58
39d3897b29
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-06 09:39:20 -04:00
Jordan Brown
f91dc76e1a
Merge pull request #31310 from ShizCalev/lobby-timer-fix
...
Fixes lobby timer showing as delayed when it's just waiting for more players
2017-10-05 09:21:43 -05:00
oranges
bb9982e772
Merge pull request #31296 from ShizCalev/landmark-cleanup
...
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
deathride58
5cefa71992
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-04 20:18:03 -04:00
Jordan Brown
cbf7ff0fc7
Dummies used for preference setup always compile overlays ( #31267 )
2017-10-04 11:03:47 -05:00
Augustfox
3e6ceaa9a2
Revert "Organize hair and facial hair in character creation" ( #3084 )
2017-10-02 23:16:51 -07:00
deathride58
70f06cfe35
config. > CONFIG_GET
2017-10-01 19:56:44 -04:00
deathride58
8e65f4fb23
Merge branch 'master' into crewobjectivesandmiscreants
2017-10-01 23:45:49 +00:00
LetterJay
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
oranges
c56bb27bbd
Merge pull request #31167 from tgstation/Cyberboss-patch-2
...
Prompt for observer confirmation now happens when you click it initially
2017-10-01 14:43:52 -05:00
ShizCalev
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
LetterJay
7263926251
Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038
...
[MIRROR] DisplayTimeText for setup time on login
2017-09-29 12:18:25 -04:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
deathride58
226ad9ddde
adjustments
2017-09-28 01:10:42 -04:00
Augustfox
612707c999
Alphabetize hair and facial hair in char creation
...
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
2017-09-27 23:45:15 -05:00
deathride58
9bdc80ba82
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-09-27 23:44:22 -04:00
ShizCalev
fa92394e4e
DisplayTimeText for round time on login
2017-09-27 15:45:05 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
CitadelStationBot
9e18d9055a
[MIRROR] Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc. ( #2886 )
...
* Merge pull request #30890 from vuonojenmustaturska/adminghostfix
Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.
* Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.
2017-09-22 04:47:39 -05:00
oranges
9ee60af5e8
Merge pull request #30768 from Cyberboss/BringingSexyBack
...
Adds back required arrivals undockedness with a config
2017-09-20 03:55:14 -05:00
deathride58
5f65202cfd
added config option to enable or disable miscreants and crew objectives
2017-09-19 20:56:16 -04:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
deathride58
252d8619da
nerfs runtime's nudity
2017-09-17 21:09:29 -04:00
CitadelStationBot
08083581c3
[MIRROR] (Hopefully) Lessens preferences and manifest injection lag ( #2796 )
...
* (Hopefully) Lessens preferences and manifest injection lag
* Update datacore.dm
* Update preferences_setup.dm
2017-09-17 11:59:40 -05:00
Poojawa
dd4f68dfee
Cleans up .rej spam and the empty file from #2792 ( #2818 )
...
* Cleans up .rej spam and the empty file from #2792
* Update tgstation.dme
2017-09-17 11:56:55 -05:00
deathride58
c4e3b778b3
Merge branch 'master' into crewobjectivesandmiscreants
2017-09-17 02:26:07 +00:00
CitadelStationBot
1051fb4fa7
[MIRROR] Corrects runtime in observer.dm ( #2610 )
...
* Corrects runtime in observer.dm
* Update observer.dm
* Update observer.dm
* Update observer.dm
* Update observer.dm
2017-09-13 22:55:22 -05:00
CitadelStationBot
099b6628fa
[MIRROR] Full jobs will no longer be shown as priority for latejoiners ( #2729 )
...
* Full jobs will no longer be shown as priority for latejoiners
* Update card.dm
2017-09-13 22:54:41 -05:00
CitadelStationBot
067e03726f
[MIRROR] Renames the mob spawner menu ( #2620 )
...
* Renames the mob spawner menu
* Actually mirrors
2017-09-13 20:42:40 -05:00
CitadelStationBot
e1d2d3d36d
[MIRROR] Adds "large bun" hairstyle ( #2609 )
...
* Adds "large bun" hairstyle
* bun hair hair'd
2017-09-13 18:34:40 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
Poojawa
2629d3b87d
Adds horse, cow tails, Sergal ears/tails also ( #2695 )
...
* Adds horse, sergal, cow tails
* Slight tweaks before bed
* sprite tweaks
2017-09-11 20:22:21 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
deathride58
d5151ed918
fixes
2017-09-07 01:01:23 -04:00
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
Poojawa
fc95b9594c
Re-disables sabresune, because wew
2017-09-05 21:23:15 -05:00
Poojawa
ef83a2db86
enables sabresune but locked for reason.
2017-09-05 07:33:55 -05:00
Poojawa
32742f0b53
fixes skunk tails too
2017-09-04 09:28:50 -05:00
