Datraen
3809e92adf
Merge pull request #1214 from Yoshax/morepreferences
...
Makes it possible to have more than 16 preferences
2016-03-29 14:44:47 -04:00
Neerti
8bfac9c57a
Merge pull request #1206 from Hubblenaut/master
...
Adds wallets to loadout menu
2016-03-28 12:49:57 -04:00
Yoshax
d0d3d3cb16
Merge remote-tracking branch 'upstream/master' into morepreferences
2016-03-27 00:17:24 +00: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
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
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +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
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
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
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Hubblenaut
f122902b84
Adds laundry basket
...
Conflicts:
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Neerti
2420ed3867
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor
2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
EmperorJon
394b1b6dea
Merge pull request #1105 from PolarisSS13/3/1/2016_surgery_kit_fix
...
Fixes #1103
2016-03-02 23:32:06 +00:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Neerti
e9957302ea
Fixes #1103
2016-03-01 01:21:28 -05:00
Neerti
c7e9acbdad
Merge pull request #1082 from Datraen/FlaregunMech
...
Adds a mech flare launcher, can be mounted on any mech.
2016-02-26 22:29:47 -05:00
Neerti
23b15390dd
Merge pull request #893 from Kelenius/AIHud
...
AI hud
2016-02-26 20:31:40 -05:00
Datraen
0b4a730bbe
Merge pull request #1083 from Kelenius/plzNoCard
...
There is now a ten-second delay for carding the AI
2016-02-26 14:36:50 -05:00
Hubblenaut
6ee464cae7
Merge remote-tracking branch 'upstream/master' into cash
2016-02-26 13:48:01 +01:00
Kelenius
e40a2b59ab
There is now a ten-second delay for carding the AI
2016-02-26 11:02:53 +03:00
Datraen
47efe8d217
Gets rid of double emotes on pAIs and AIs.
2016-02-25 12:39:00 -05:00
Datraen
55a024ef14
Adds a mech flare launcher, can be mounted on any mech.
2016-02-24 21:15:48 -05:00
Hubblenaut
c22f9b2996
Merge remote-tracking branch 'upstream/master' into cash
2016-02-21 17:48:19 +01:00
Datraen
9d269ab470
Merge pull request #1033 from Yoshax/burnbabyburn
...
Allows lighting of smokeables on burning people
2016-02-21 11:32:16 -05:00
Hubblenaut
60f5358751
All cash now acts like bundles
2016-02-21 17:23:54 +01:00
sabess
71d8acc2cb
Fixed the damage again, oops.
2016-02-21 23:06:05 +11:00
sabess
cb1e26ec70
Fixed conflicts with another thing.
2016-02-21 22:48:56 +11:00
