Commit Graph

13632 Commits

Author SHA1 Message Date
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
Mark9013100
03d1fbcf10 Gives the QM a proper stamp 2016-03-24 14:52:55 -04:00
Neerti
faf538a832 Merge pull request #1246 from Datraen/XenoarchSpawnFix
Fixes a check in xenoarch master controller.
2016-03-24 12:17:07 -04:00
Datraen
4c9c5e5870 Fixes a check in xenoarch master controller. 2016-03-24 10:17:26 -04:00
Neerti
dfb6ea7071 Merge pull request #1241 from Mark9013100/3/23/2016magstorage
Armor can now hold maglights
2016-03-24 09:06:51 -04:00
Neerti
b457b54b02 Merge pull request #1234 from Yoshax/IB
Fixes IB surgery not checking for open ribs etc
2016-03-23 20:42:48 -04:00
Neerti
3e45f9f727 Merge pull request #1235 from Yoshax/watercooler
Watercooler can be wrenched/unwrenched now
2016-03-23 20:28:12 -04:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00
Mark9013100
ce1e4bc33b Capitalizes pill description. 2016-03-23 16:09:21 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Brian Cook
9edc1dd549 Watercooler can be wrenched/unwrenched now
Fixed capitalization in some cases
2016-03-23 13:13:54 +00:00
Chinsky
2ad91fc60c Fixes IB surgery not checking for open ribs etc
Guess it wasn't updated after Zuh's encased changes
2016-03-23 13:08:08 +00:00
Mark9013100
e62863e1b3 Renames the security .45 2016-03-22 23:03:21 -04:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Neerti
9027b0f391 Merge pull request #1221 from Ithalan/master
Fixes Anomaly Analyzer reading the wrong variable for the artifact effect's range
2016-03-22 21:36:42 -04:00
Neerti
0891eba8cd Merge pull request #1207 from Datraen/GTStationWide
Adds a check to the greytide virus to see if the APCs are operating.
2016-03-22 21:36:35 -04:00
Neerti
6c1187d3f7 Merge pull request #1228 from Yoshax/resomiblood
Make human vessels properly adjust capacity on species change
2016-03-22 21:33:24 -04:00
Yoshax
c7dd36a297 Make human vessels properly adjust capacity on species change 2016-03-22 22:45:39 +00:00
EmperorJon
aea690febf Merge pull request #1222 from Datraen/XenoarchSpawnFix
[XENOARCH] Checks to see if the turf is a floor before spawning artifacts.
2016-03-22 22:34:52 +00:00
Datraen
fbbfb78dec Merge pull request #1212 from Kelenius/feedMeLight
Fixes #1171 - ninja suit injects nutriment
2016-03-22 15:15:14 -04:00
Matt
61d2eb1d3e Properly log dropper-related assault for admins
Fixes bug #1219

Moving the logging from post-dropping (when the dropper is empty) to Pre-drop, post-dropable check (it should not be located at the point when a drop is going to occur, but just prior to actually doing so).

As always, please review this change to make sure I didn't break anything.  All I did was cut-paste the lines to a few lines above, but hey, never hurts to double-check!
2016-03-22 13:11:48 -04:00
Datraen
b36edb0690 Merge pull request #1213 from Kelenius/topicTime
Removes topic limiter
2016-03-22 10:59:22 -04:00
Ithalan
f3066a926f Fixes Anomaly Analyzer reading the wrong variable for the effect's range, resulting in nearly all anomalies erronously showing as transmitting their effect on touch. 2016-03-22 02:27:31 +01: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
Kelenius
f41f52dea8 Removes topic limiter 2016-03-21 16:28:15 +03:00
Kelenius
1683761d6a Fixes #1171 2016-03-21 14:22:44 +03:00
Datraen
7f95bf177e Checks to see if the turf is a floor before continuing to spawn artifacts. 2016-03-20 14:54:05 -04: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
eb6f621ca9 Adds a check to the greytide virus to see if the APCs are operating. 2016-03-18 15:20:48 -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
Yoshax
9f4ff63d11 Makes being muted from something more visible 2016-03-16 20:29:18 +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
Hubblenaut
a8fd336be9 Amends gargle blaster recipe 2016-03-16 17:56:02 +01: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
redstryker
1a0a517f47 Adds Security Skirts 2016-03-15 23:04:26 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03: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
Yoshax
5cc4b397fe Adds new hair, ported from bay 2016-03-14 22:34:18 +00: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
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
Datraen
1b40fb3bfe Traitor Borg lockdown, blowing-up fixed; can now self-hack. 2016-03-12 17:03:28 -05:00