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
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
Zuhayr
4820420182
Added several mobsize and Teshari checks to reagent processing.
2016-02-08 20:21:04 +10:30
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16
Merge pull request #810 from Zuhayr/bayupdate
...
Bay update.
2016-02-05 23:21:07 -05:00
Zuhayr
115eb19d33
Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate
2016-02-06 14:30:51 +10:30
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
Zuhayr
408cb5d8d8
Adds a coverage check to xenoflora splattering, adjusts brainloss across
...
the board.
2016-01-31 11:49:14 +10:30
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
Kelenius
6de7243862
Fixes #120
2016-01-27 13:30:13 +03:00
Kelenius
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
1c100bf457
Cleaning up post-merge.
2016-01-22 01:22:49 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Hubblenaut
39cdd540fe
Center_of_mass for snacks/dishes
2016-01-16 19:45:17 +01:00
Zuhayr
d0717791dc
Fixes #270
2016-01-14 00:33:31 +10:30
Hubblenaut
42b7acea8b
Merge remote-tracking branch 'upstream/master' into coffee
2016-01-13 02:19:22 +01:00
Hubblenaut
721728d3dd
Adds porcelaine cups
2016-01-12 19:42:43 +01:00
Zuhayr
40b7c087c9
Attempting to fix perma-wet-floors bugs.
2016-01-12 15:50:20 +10:30
Zuhayr
905cb5943d
Readds blindness removal to imida
...
zoline and organ surgery. Stops imidazoline healing robotic eyes.
2016-01-09 13:24:46 +10:30
Hubblenaut
f4fe6daf3d
Adds sugar dispensers
2016-01-02 15:32:51 +01:00
Hubblenaut
e5de78b647
Adds coffee dispenser
2016-01-02 15:32:48 +01:00
GinjaNinja32
9dee0707e8
Merge remote-tracking branch 'polaris/master' into pl-chemistry
2015-12-24 15:06:16 +00:00
Zuhayr
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
