Commit Graph

22217 Commits

Author SHA1 Message Date
Yoshax
a997d2daa8 Updates cryopod to have nicer code
no message
2016-03-21 17:20:52 +00:00
PsiOmegaDelta
d6797056f2 Adds progress bars to tasks that take time 2016-03-21 17:13:23 +00:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Kelenius
f2a504d822 Merge branch 'master' into plzNoFat 2016-03-18 21:38:34 +03:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
bc1bbafaad new_player: absolute pathing 2016-03-17 16:35:09 +03:00
Neerti
e9b9e3c5e1 Merge pull request #1189 from Kelenius/varCleanup
Moves a few vars where they should be
2016-03-16 21:35:05 -04:00
Neerti
48427ea301 Merge pull request #1196 from Kelenius/goFaster
Optimizes restart
2016-03-16 21:33:58 -04:00
Neerti
4cec8b64f3 Merge pull request #1199 from Yoshax/headsalert
Changes alert level changing to no longer require ID swiping
2016-03-16 20:38:39 -04:00
Yoshax
9f4ff63d11 Makes being muted from something more visible 2016-03-16 20:29:18 +00:00
Yoshax
656a760bcc Changes alert level changing to no longer require ID swiping, in-line with other functions 2016-03-16 20:08:51 +00:00
EmperorJon
c27a69b24a Merge pull request #1193 from redstryker/master
Adds Security Skirts, A Poncho, And Some Fixes
2016-03-16 19:04:42 +00:00
EmperorJon
f1749aa73f Merge pull request #1194 from Datraen/MoreGameModes
Adds lizard, visitors and intrigue* game modes + tweaks.
2016-03-16 19:03:40 +00:00
Datraen
a433a75115 Merge pull request #1197 from EmperorJon/16_Mar._AFK_timers
Adds AFK markers and timers to all players in "who"
2016-03-16 14:55:08 -04:00
EmperorJon
8783cfd79c Merge pull request #1198 from Hubblenaut/master
Amends gargle blaster recipe
2016-03-16 18:51:27 +00:00
EmperorJon
d24cdf611a Merge pull request #1192 from Datraen/TraitorBorgFix
Adds a check to prevent traitor cyborgs from being able to hack other cyborgs.
2016-03-16 18:47:09 +00:00
Hubblenaut
a8fd336be9 Amends gargle blaster recipe 2016-03-16 17:56:02 +01:00
Jon
5211331ea5 Adds AFK markers and timers to all players in "who", can be seen by admins and moderators. 2016-03-16 15:55:46 +00:00
Datraen
141962b22f Adds lizard, visitors and intrigue game modes. 2016-03-16 11:11:44 -04:00
redstryker
93def97663 Removed Armor and Siemens Coefficient from Skirts 2016-03-16 08:28:43 -04:00
Kelenius
1afd4af7bb Optimizes restart
Cuts 7-8 seconds
2016-03-16 14:49:37 +03:00
Datraen
8075c3abcc Adds a check to prevent traitor cyborgs from being able to hack other cyborgs.
Prevents traitor AIs from hacking other AI's borgs.
2016-03-15 23:10:09 -04:00
redstryker
1a0a517f47 Adds Security Skirts 2016-03-15 23:04:26 -04:00
Mark9013100
a8d90003ca Ports /tg/'s warden locker sprite 2016-03-15 06:49:25 -04:00
Kelenius
1d26fcfa8e Moves a few vars where they should be
This should reduce the memory usage
2016-03-15 11:26:46 +03:00
Datraen
5104957ff8 Merge pull request #1186 from Yoshax/hairaddition
Adds 5 new hair
2016-03-14 18:54:43 -04:00
EmperorJon
11ddfae6eb Merge pull request #1185 from Datraen/HarmBatonHallos
Harmbatons no longer cause hallos while not on.
2016-03-14 22:41:55 +00:00
Yoshax
5cc4b397fe Adds new hair, ported from bay 2016-03-14 22:34:18 +00:00
Datraen
370d58f54a Harmbatons no longer cause hallos while not on. 2016-03-14 17:31:58 -04:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Neerti
634bab54e5 Merge pull request #1173 from Datraen/TraitorBorgFix
Traitor Borg lockdown, blowing-up fixed; can now self-hack.
2016-03-14 08:52:30 -04:00
Neerti
1c18d9cb73 Merge pull request #1174 from Mark9013100/3/12/2016mercnuke
Gives the mercs a nuke...
2016-03-14 08:48:33 -04:00
Neerti
3fcc89f666 Merge pull request #1182 from Kelenius/plzNoSpam
Cuts down shard spam
2016-03-14 08:41:20 -04:00
Neerti
ccb6f5bd60 Merge pull request #1132 from Hubblenaut/laundry
Laundry Basket
2016-03-14 08:40:43 -04:00
Kelenius
25e7dbb86f Cuts down shard spam 2016-03-14 14:46:43 +03:00
Datraen
5d4ad7aa89 Fixes a potential runtime error. 2016-03-14 07:45:47 -04:00
Datraen
48b4b115ae Merge pull request #1181 from Kelenius/plzExplode
Fixes chemical explosions
2016-03-14 07:37:23 -04:00
Datraen
4898de1965 Merge pull request #1180 from Neerti/3/14/2016_merc_roundend_announcement
Fixes mercenaries not showing up at round-end.
2016-03-14 07:35:03 -04:00
Kelenius
79e850f4d7 Fixes chemical explosions 2016-03-14 12:21:35 +03:00
Mark9013100
037de7086d Gives the mercs a nuke 2016-03-14 02:55:52 -04:00
Neerti
a61708e369 Fixes mercenaries not showing up at round-end.
Also changes 'borg' to 'synthetic' at round-end text.
2016-03-14 02:40:33 -04:00
Datraen
1b40fb3bfe Traitor Borg lockdown, blowing-up fixed; can now self-hack. 2016-03-12 17:03:28 -05:00
EmperorJon
2aa4e7727c Merge pull request #1167 from PolarisSS13/3/11/2016_leg_guard_fix
Fixes oversight in leg-guard slowdown.
2016-03-12 19:32:39 +00:00
EmperorJon
a730a61478 Merge pull request #1172 from redstryker/Turbans+Kippot
Adds Turbans and Kippot and a Hoodie (V2)
2016-03-12 19:31:15 +00:00
EmperorJon
27842e182e Merge pull request #1166 from Yoshax/splitundie
Splits underwear into top underwear and bottom underwear
2016-03-12 19:30:38 +00:00
redstryker
5f7443c063 Adds Turbans and Kippot 2016-03-12 12:34:41 -05:00
Yoshax
44b8ac218c Adjusts underwear names 2016-03-12 15:57:21 +00:00
Kelenius
89ff4f5fc3 Adds ..() to /obj/structure/New() 2016-03-12 14:13:13 +03:00
Yoshax
3b5a027025 Merge remote-tracking branch 'upstream/master' into splitundie 2016-03-12 02:27:54 +00:00
Yoshax
d64bfb3235 Actually fixes the underwear wardrobe 2016-03-12 02:22:34 +00:00