Commit Graph

843 Commits

Author SHA1 Message Date
Squirgenheimer
fcc86e1903 antag candidacy button can be clicked after join 2018-11-05 02:14:28 -05:00
Squirgenheimer
5d1ac25a64 moves skip_antag to client level, adds checks for it in autotraitor.dm and blob.dm 2018-11-05 02:02:40 -05:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose
4e22a2d907 naked syndicates are useless syndicates 2018-10-05 23:13:19 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
1d1b0daaa0 Fixes gearspawning for good 2018-09-27 11:40:39 +08:00
variableundefined
1820e9cb19 Fixes gear disappearing on lobby screen 2018-09-23 19:31:12 +08:00
Crazy Lemon
63509d8f06 Merge pull request #9390 from shazbot194/Lumi_screen
Lumi's custom face
2018-09-16 15:48:04 -07:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
shazbot194
3b6abef55c Merge Fix 2018-09-09 11:17:11 -08:00
Sam
aa675d3749 candidancy -> candidacy 2018-09-09 12:55:28 +01:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
FreeStylaLT
adabbcbcca woops 2018-08-26 15:23:00 +03:00
FreeStylaLT
267fa29184 re-dos the PR 2018-08-26 11:20:39 +03:00
FishStix4Dayz
94b5b26418 deleted extra line of code 2018-08-24 19:20:47 -05:00
FishStix4Dayz
e55d50b199 New Vulp hairstyle 2018-08-23 22:28:51 -05:00
shazbot194
71f08327d6 Adds in two more faces for Lumi 2018-08-22 16:28:07 -08:00
shazbot194
4557b306cf Lumi Face 2018-08-20 20:56:21 -08:00
Fox McCloud
ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Fox McCloud
648049def0 better runtime fix 2018-07-19 04:08:43 -04:00
Fox McCloud
59d0e53754 fixes vox no DNA head runtime 2018-07-19 03:51:42 -04:00
Fox McCloud
6092e0319f name and further fixes 2018-07-19 02:04:03 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Kyep
b65c84cd13 fixes can_vote runtime 2018-06-14 03:05:13 -07:00
Alffd
f83e8b6aa7 Fix no ToS error 2018-05-26 19:08:53 -04:00
Alffd
83305fa790 Probably fine 2018-05-25 16:35:48 -04:00
Alffd
61d746e009 Tiger changes 2018-05-25 15:51:03 -04:00
Alffd
e00c98fdde Space saving 2018-05-25 14:05:05 -04:00
Alffd
ef1b44b955 Terms of service click through. 2018-05-25 03:40:16 -04:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Sam
a316c544f4 ree 2018-04-21 15:23:27 +01:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	code/world.dm
2018-04-02 17:24:36 -07:00
tigercat2000
64c3bd0eb0 Merge pull request #8754 from IK3I/SubversionOfTheSubverted
When you're not in the mood...
2018-04-01 20:38:21 -07:00
IK3I
1350dfa0c2 Updates wording 2018-04-01 22:30:50 -05:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
2018-03-25 23:01:04 -07:00
IK3I
e635f7cbf3 Antag Toggle now appears only after antags are chosen in preferences. 2018-03-21 18:43:52 -05:00
IK3I
404150ba8f For the sake of clarity 2018-03-13 00:45:26 -05:00
IK3I
da0e7b595a Adds a preround antag roll toggle 2018-03-11 19:41:21 -05:00
Aurorablade
0e558f5b51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin 2018-03-01 19:55:48 -05:00
Aurorablade
86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Aurorablade
63537a050b new hair 2018-02-21 01:36:17 -05:00
Aurorablade
e1ea595798 do_colouration fix 2018-01-27 18:30:52 -05:00