Commit Graph

5675 Commits

Author SHA1 Message Date
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Mark9013100
f57eef764f Bedsheets can be worn as capes 2016-03-28 22:01:37 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master
Adds wallets to loadout menu
2016-03-28 12:49:57 -04:00
Mark9013100
26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Neerti
0844d0b9f0 Merge pull request #1239 from Mark9013100/3/23/2016layering
Layering fixes for bedsheets/curtains
2016-03-26 17:06:54 -04:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8 Merge pull request #1169 from Kelenius/fixesOnly
Axes old wire, fixes costs in lathe
2016-03-26 15:42:25 -04:00
Datraen
c09bb6d807 Removes JSON encoding of PDA Manifest list. 2016-03-26 15:31:08 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Yoshax
288be19de4 Changes some antag items to not have 'suspicious' in their name 2016-03-25 19:28:49 +00:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Mark9013100
200057397a Layering fixes for bedsheets/curtains 2016-03-23 16:19:41 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
PsiOmegaDelta
e7686dd3e7 Camera fixes and performance tweaks.
Improves camera EMP handling. Now uses a var and processing to determine when the EMP should end, preventing inconsistent states when a camera is EMPd multiple times.

Reduces the process and bandwidth need for cameras.
* There is now a common camera repository, responsible for setting up cameras once for every invalidation.
* Camera consoles now only updates when the camera cache is invalidated, not every second.
* The console now only presents one network at a time, and only sends the data necessary to view that network (as opposed to sending the data for all cameras).
2016-03-21 17:30:52 -04:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +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
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Hubblenaut
5c1e5a89e6 Adds wallets to loadout menu 2016-03-18 13:07:38 +01: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
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03: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
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
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
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
Kelenius
79e850f4d7 Fixes chemical explosions 2016-03-14 12:21:35 +03:00
Kelenius
359889a15c Axes old wire, fixes costs in lathe 2016-03-12 11:38:52 +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
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +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
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
51a6241fdd Merge remote-tracking branch 'upstream/master' into laundry 2016-03-09 15:56:16 +01: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
Mark9013100
bba0d7e786 Adds departmental bags to wardrobes 2016-03-08 16:37:30 -05:00
Datraen
c2b9452e08 Merge pull request #1130 from Hubblenaut/windowverbs
Window Rotation Verbs QOL
2016-03-08 16:35:53 -05:00