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
Datraen
dab56d472b
Adds default reagent amounts to slices if they have no reagents.
2016-04-06 23:50:14 -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
SinTwo
b356f5cf21
Construction Update
2016-03-25 16:02:36 -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
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
03a8b46e97
Fixes a roundstart runtime
2016-03-11 12:16:24 +03: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
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
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
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
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
721728d3dd
Adds porcelaine cups
2016-01-12 19:42:43 +01:00
Hubblenaut
f4fe6daf3d
Adds sugar dispensers
2016-01-02 15:32:51 +01: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
Zuhayr
d71573e749
Further work on properly integrating, updating and fixing prosthetic options.
...
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Neerti
e3bf3483c8
Merge pull request #559 from Yoshax/master
...
Adjusts the death-whiskey
2015-12-13 21:28:09 -05:00
Neerti
2aaa4e9a5e
Merge pull request #525 from Zuhayr/qol
...
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
Yoshax
1eb91b3144
Adjusts the death-whiskey
2015-12-13 22:46:42 +00:00
Yoshax
48dcb85b44
Makes the mythical special blend whiskey real
2015-12-13 03:31:36 +00:00
Zuhayr
793bc18efd
Mops can now be wet in buckets or sinks.
2015-12-11 15:54:56 +10:30
Zuhayr
2edf2c499f
POCKET SAND!
2015-12-11 15:53:40 +10:30
Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
mwerezak
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
Yoshax
db7af654ec
Adds checks to ensure target is valid, adds user feedback
2015-12-05 15:10:10 +00:00
Yoshax
4c201d8219
Adds ability to smash bottles on things other than people's heads
2015-12-05 14:22:40 +00:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
PsiOmegaDelta
e37394e8fa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human_helpers.dm
code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
PsiOmegaDelta
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14
Can no longer use utensils to eat if you lack the means.
...
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes #11333 .
2015-10-22 16:52:07 +02:00
PsiOmegaDelta
0b9b8feb1e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8
Merge pull request #11340 from Baystation12/master
...
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta
4c96cd62a7
Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334 .
2015-10-20 17:11:55 +02:00
HarpyEagle
e24313be2e
Fix macro
2015-10-15 07:02:57 -04:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
