oranges
2dd1f1f799
Merge pull request #34470 from Cyberboss/MoveMotd
...
Moves load_motd to config controller
2018-01-16 14:28:07 -06:00
oranges
3b9b6f156e
Merge pull request #33933 from coiax/wizard-late-joining
...
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
deathride58
fd9bc8c35e
mob folder - camera to dead
2018-01-04 00:59:07 -05:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
CitadelStationBot
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
oranges
7c45ae5cb7
Adds Extended Drill Hair
2017-11-13 03:12:44 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
oranges
c3dbb8925b
Merge pull request #31987 from Cyberboss/InlineCO
...
May as well shave some yaks
2017-10-26 05:05:09 -05:00
LetterJay
3822aa83a3
Update new_player.dm
2017-10-24 19:49:38 -05:00
LetterJay
72bd156589
Update new_player.dm
2017-10-24 18:19:49 -05:00
LetterJay
e20664dad3
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
2017-10-24 18:18:20 -05:00
LetterJay
aa420067ba
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa
Late join antagonists will try to target late join players ( #31560 )
2017-10-23 20:08:43 -05:00
Michiyamenotehifunana
9d52443c53
Fixes #2946
...
Otusian, wolf, and skunk ears now show up on humans. Cat, Big ears now show up on mammals.
2017-10-23 19:29:46 +08:00
CitadelStationBot
3e1c307e4e
[MIRROR] Adds sports bras ( #3354 )
...
* Adds sports bras
* Update sprite_accessories.dm
* actually add the sprites.
2017-10-21 07:29:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
AnturK
64b1be05ff
Adds logging crew manifest to seperate file ( #31665 )
...
* Adds logging crew manifest to seperate file
* Coding blind
* i can spel words
* Not everyone in the lobby please.
* Proper header
* Fix
* Better format
2017-10-15 16:56:48 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -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
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
