Commit Graph

22192 Commits

Author SHA1 Message Date
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
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
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
Neerti
e43993b11b Fixes oversight in leg-guard slowdown.
The slowdown was effectively 2 instead of 1 as intended, totaling 3 slowdown for the full set, which is more than the voidsuit slowdown, iirc.
2016-03-11 21:13:59 -05:00
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
EmperorJon
39a2008432 Merge pull request #1142 from Hubblenaut/cash
Retail Scanners, Price List Update and Interface Improvements
2016-03-11 23:37:43 +00:00
EmperorJon
40df50e5a2 Merge pull request #1131 from Hubblenaut/barrecipes
Fixes two bar recipes
2016-03-11 21:03:15 +00:00
EmperorJon
7734092d85 Merge pull request #1160 from Mark9013100/3/11/2016nomoreslides
Removes the need for slides in forensics
2016-03-11 21:00:48 +00:00
EmperorJon
78c53866c2 Merge pull request #1150 from Kelenius/noSplash
Removes splash code
2016-03-11 20:47:40 +00:00
Datraen
42bdf7dffc Merge pull request #1066 from Yoshax/moarundies
Adds even more underwear
2016-03-11 14:41:12 -05:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Kelenius
03a8b46e97 Fixes a roundstart runtime 2016-03-11 12:16:24 +03:00
Mark9013100
905bda9b2d Removes the need for slides in forensics 2016-03-11 03:53:12 -05:00
Datraen
9b9a23860e Merge pull request #1149 from Kelenius/AIPDAFix
Fixes #1145
2016-03-10 15:25:32 -05:00
Datraen
addbfe11d5 Merge pull request #1153 from Hubblenaut/windowverbs
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut
c7c5e22717 verb shows on playermade windows 2016-03-10 17:06:09 +01:00
Kelenius
974a2a8216 Removes splash code
Unused
2016-03-10 10:55:35 +03:00
Kelenius
069a2e52a9 Fixes #1145
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Neerti
d412c0a070 Merge pull request #1134 from Kelenius/moreDrills
Constructible drills
2016-03-09 20:52:58 -05:00
Hubblenaut
0331ca9242 Extensive Interface Improvement 2016-03-10 01:12:49 +01:00
Hubblenaut
2c815af526 Adjusts price cumulation and logs 2016-03-09 19:06:58 +01:00
Hubblenaut
6ea7295e87 Updates price list 2016-03-09 17:40:11 +01:00
Hubblenaut
51a6241fdd Merge remote-tracking branch 'upstream/master' into laundry 2016-03-09 15:56:16 +01:00
Mark9013100
994388e138 Fixes floor decal layering 2016-03-09 01:45:47 -05:00
Mark9013100
4963d5a858 New combat helmet sprite 2016-03-08 21:37:04 -05:00
Neerti
7b9f011d10 Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Datraen
be4564d30e Merge pull request #1128 from Hubblenaut/cash
Retail Scanner, Fixes and QOL
2016-03-08 16:40:02 -05:00