Datraen
4456f77d75
Merge pull request #1551 from Zuhayr/master
...
Makes slime people more interesting and thematic.
2016-05-11 02:34:50 -04:00
Yoshax
e2293f1e79
Gives drinking glasses a material so they have a cost in autolathe
2016-05-08 15:51:16 +01:00
Zuhayr
6edb8b31f3
Made slimes more interesting.
2016-05-06 04:07:52 +09:30
Dibasic
626dc8a2f6
Change chemmaster custom preset to 15 and adds options for 30 and 60 units ( #1548 )
...
* Change chemmaster custom preset to 60
60 is more commonly used for filling a whole bottle. The preset was 30 back when bottles only held 30.
* Adds options for moving 30 and 60 units
Also changes the default to 15 because 30 and 60 are now options.
2016-05-04 23:23:59 -04:00
Datraen
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Datraen
8483146716
Merge pull request #1478 from Nerezza/PizzaUpdate
...
Makes opening/closing pizza boxes easier
2016-04-28 09:25:43 -04:00
Nerezza
4c7537e180
Makes opening/closing pizza boxes easier
...
Alt-click now opens/closes pizza boxes like a laptop.
2016-04-21 21:43:32 -05:00
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Datraen
2b53efdfd5
Merge pull request #1303 from Hubblenaut/hydro
...
Full fertilizer bottles of type glass/bottle
2016-04-20 11:31:31 -04:00
EmperorJon
ebeaddea6e
Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar
...
Fixes some punctuation
2016-04-20 13:23:51 +01:00
Hubblenaut
2b44de88b1
Change to absolute pathing
2016-04-20 13:21:35 +02:00
EmperorJon
47f715805e
Merge pull request #1442 from Yoshax/drinksloadout
...
Loadout (vacuum-)flask contents now configurable.
2016-04-18 16:33:42 +01:00
Yoshax
f0c69e663d
Fixes error
2016-04-18 15:53:09 +01:00
PsiOmegaDelta
2e6f2c53a6
Loadout (vacuum-)flask contents now configurable.
...
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
2016-04-18 15:30:26 +01:00
HarpyEagle
03c2ace543
Fixes #11520
...
Makes overdosing check volume instead of amount metabolised as its criteria
2016-04-18 15:16:31 +01:00
EmperorJon
482316ed55
Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
...
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100
06cff6d6af
Fixes some punctuation
2016-04-15 01:01:58 -04:00
Datraen
dab56d472b
Adds default reagent amounts to slices if they have no reagents.
2016-04-06 23:50:14 -04:00
Neerti
469c01daf9
Manually ports Bay's volume inventory system.
2016-04-06 03:31:21 -04:00
PsiOmegaDelta
48b773fcfa
Can now select the design and contents of your loadout lunchbox.
...
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
2016-04-05 11:57:30 -04:00
Hubblenaut
3a45ceee64
Full fertilizer bottles of type glass/bottle
2016-03-30 19:42:13 +02:00
Neerti
96e52f5af0
Merge pull request #1229 from SinTwo/construction_update
...
Construction update
2016-03-26 15:45:19 -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
f0487bc6b4
Reagent Dispenser Update
2016-03-25 16:59:07 -04:00
SinTwo
b356f5cf21
Construction Update
2016-03-25 16:02:36 -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
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
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
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
Kelenius
1683761d6a
Fixes #1171
2016-03-21 14:22:44 +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
Hubblenaut
a8fd336be9
Amends gargle blaster recipe
2016-03-16 17:56:02 +01: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
EmperorJon
40df50e5a2
Merge pull request #1131 from Hubblenaut/barrecipes
...
Fixes two bar recipes
2016-03-11 21:03:15 +00:00
Kelenius
03a8b46e97
Fixes a roundstart runtime
2016-03-11 12:16:24 +03:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Hubblenaut
64501e9937
Fixes two bar recipes
2016-03-07 20:18:14 +01:00
Neerti
b4b8d94723
Merge pull request #1015 from Zuhayr/xenosremove
...
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
69140184b3
Fixes ID computers.
...
Also fixes what appears to be a merge error in condiments, which made my compiler complain.
oh, someone also added FILE_DIR previously, as well. Fixed that too.
2016-02-28 08:08:23 -05:00
Hubblenaut
6ee464cae7
Merge remote-tracking branch 'upstream/master' into cash
2016-02-26 13:48:01 +01:00
Hubblenaut
1a212ed96f
Fixes condiment placement
2016-02-26 12:24:36 +01:00
Hubblenaut
491a83ca72
Adds prices for snacks and drinks
2016-02-22 17:34:23 +01:00
Kelenius
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Kelenius
a5e4aa33d5
Monkey cubes now expand in showers
...
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
2016-02-18 12:24:38 +03:00
