Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
Zuhayr
74db1f71b5
Merge pull request #9018 from Kelenius/ofChemAndTwo
...
Chemistry recipes: absolute pathing
2015-04-29 00:15:20 +09:30
Kelenius
185aadb5a9
Chemistry recipes: absolute pathing
2015-04-28 16:55:13 +03:00
Chinsky
04b994f939
Merge pull request #9008 from PsiOmegaDelta/CameraPoff
...
Adds the APC & camera damage events.
2015-04-28 13:49:50 +03:00
Kelenius
948252d25b
Removes unused files added by accident, separates reagent files
2015-04-28 11:00:56 +03:00
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmega
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624
Merge pull request #9015 from Kelenius/ofChemAndOne
...
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
PsiOmegaDelta
bb7cd10cbb
Merge pull request #8984 from volas/master
...
Fixes #8913
2015-04-28 07:53:45 +02:00
Chinsky
0ff3d9af99
Merge pull request #9005 from mwerezak/master-fixes
...
Fixes (master)
2015-04-28 06:26:32 +03:00
Chinsky
afa82e5d83
Merge pull request #9003 from mwerezak/dev-fixes
...
Fixes
2015-04-28 06:26:22 +03:00
Chinsky
1328414485
Merge pull request #8960 from mwerezak/item-color
...
Fixes #8577 , cleans up item_color, clothing/under and backpacks
2015-04-28 06:25:35 +03:00
volas
59e17f7a9b
small fix
2015-04-28 00:41:14 +03:00
mwerezak
36d9944dfd
Fixes #8977
2015-04-27 14:55:18 -04:00
mwerezak
d0615430ec
Fixes #8997
...
Gibbing a human now causes all items on or in their person to get thrown around.
This includes implants and bullet shrapnel.
2015-04-27 14:48:55 -04:00
PsiOmega
27e91b3fa0
Cameras now have a small chance of being permanently destroyed.
2015-04-27 19:09:46 +02:00
PsiOmega
4bddde11ae
Using cameranet cameras to avoid burning out things like ERT/mercenary helmet cameras and traitor spy cams.
2015-04-27 11:14:31 +02:00
PsiOmega
ed81d9fd63
Adds the ACP damage event.
2015-04-27 10:56:14 +02:00
PsiOmega
8626a83675
Adds the camera loss event.
2015-04-27 10:47:45 +02:00
PsiOmega
a78c559f6c
Merge remote-tracking branch 'upstream/master' into dev
2015-04-27 08:08:39 +02:00
mwerezak
290a7d5000
Fixes #8536
...
Also removes a bunch of redundant comments
2015-04-27 01:11:40 -04:00
Kelenius
159ad76fab
Fixes #8998
2015-04-27 08:06:21 +03:00
mwerezak
529a0e3fe9
Fixes #8992
2015-04-27 00:37:16 -04:00
mwerezak
c2751b0b12
Fixes #8823
2015-04-27 00:26:53 -04:00
Zuhayr
1c627a94b9
Merge pull request #8991 from Kelenius/ofBotsAndMobs
...
Updates bots to be mobs. Several changes.
2015-04-27 11:29:32 +09:30
mwerezak
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
PsiOmegaDelta
967223364d
Merge pull request #8988 from mwerezak/droplimb
...
Adjusts threshold for limb removal due to damage
2015-04-26 19:16:34 +02:00
Chinsky
e0c00bda55
Merge pull request #8973 from mwerezak/inventory2
...
Inventory updates
2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a
Merge pull request #8982 from PsiOmegaDelta/Bullets
...
Adds practice rounds.
2015-04-26 20:06:37 +03:00
Chinsky
7359562e16
Merge pull request #8905 from PsiOmegaDelta/BorgModules
...
Silicon Subsystem update.
2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0
Merge pull request #8975 from PsiOmegaDelta/Thunderdome
...
Custom ambiance music for holodeck programs.
2015-04-26 20:05:58 +03:00
Kelenius
b7a628d53d
Merge branch 'dev' into ofBotsAndMobs
...
Conflicts:
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/secbot.dm
code/game/objects/items/robot/robot_parts.dm
2015-04-26 17:18:20 +03:00
PsiOmega
fe09ed1a22
Merge remote-tracking branch 'upstream/dev' into BorgModules
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc
Makes it possible for borg modules to include specific subystems.
2015-04-26 15:42:36 +02:00
Kelenius
baf19eb862
Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs
2015-04-26 15:47:38 +03:00
Kelenius
6d1614cb7a
Updates bots to be mobs. Several changes.
...
General:
Bots are now /mob/living/bot. They support player control fully. Just in
case an admin feels like letting a ghost take control of beepsky or
something.
Since they are bots, spooders and whatnot will attack them.
They now don't need an open panel to be emagged.
Spawns replaced with do_after, meaning that they will stop
injecting/cleaning/repairing/arresting if pulled away.
Medbot:
Emagger is added to ignore list.
Will now inject spaceacilin regardeless of disease type and level.
Previously: only if disease was past stage 1 or airbone.
Cleanbot:
Patrolling rewritten. They now find a closest beacon, and go to the NEXT
beacon after the closest one.
They will not wiggle out when pulled.
They will now ignore (for a while) the gibs they make if odd button is
pressed.
They will now freely claim cleanables. Previously, they would not target
ones targeted by other bots.
Floorbot:
This was a helluva buggy one.
They will now build bridges (but still won't do random repairs) in space
area.
They will now build bridges even if the tile directly next to them in
that direction is tiled.
They will now ignore for a while a tile they can't reach. This is to
stop them from hopelessly targeting tiles under grilles for upgrades and
getting stuck.
They will now slowly (200 ticks for a tile) build new tiles on their
own.
They will now preserve tile's icon when repairing it like a player
would.
They will now place first rods, then tile when fixing space breaches.
Rod costs two tiles.
When emagged, they will first always tear off the tile, then will (over
triple the normal amount of time) breach the tile to space. There are
noticeable warnings for both actions.
Secbot:
Will no longer run away to patrol when panel is open.
Now deals stamina damage instead of instastuns.
Small delay between approaching the target and stunning them.
Laserbots axed.
Removed their weird EMP act.
Will no longer stun lying people, just cuff.
They will also demand surrenderring (lying down) before smacking you. If
target moves, or 5 seconds pass, it will attack.
Farmbot:
It's alive!
It has settings to: water trays, refill its own water, uproot weeds, add
nutriment (ammonia, internal synthesizer), collect produce, and remove
dead plants.
2015-04-26 15:30:11 +03:00
PsiOmega
e54fbcb9ec
Cleans up borg module code and responsibilities.
2015-04-26 12:00:30 +02:00
mwerezak
229f4cb043
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/modules/customitems/item_defines.dm
2015-04-26 02:04:59 -04:00
mwerezak
b20f604d0c
Adjusts threshold for limb removal due to damage
2015-04-26 01:58:52 -04:00
Chinsky
3e3b772a13
Merge pull request #8926 from Yoshax/loadoutpoints
...
Adjusts custom loadout item prices.
2015-04-26 00:48:39 +03:00
Chinsky
f48b9be16b
Merge pull request #8974 from mwerezak/balaclava
...
Fixes balaclava sprite sheets
2015-04-26 00:46:06 +03:00
volas
53a95d8eff
Fixes #8913
2015-04-25 22:43:50 +03:00
mwerezak
78a02c705b
Removes unnecessary and out of place item dropping in human icon code.
2015-04-25 13:55:47 -04:00
mwerezak
4829f1d82d
Adds calls to mob_can_unequip() where appropriate
2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b
Refactors mob_can_equip(), adds unequip checks
2015-04-25 13:54:59 -04:00
PsiOmega
4a35631af1
Attempts to save Yosh's code.
2015-04-25 16:39:09 +02:00
PsiOmega
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
mwerezak
4d9586ecae
Fixes balaclava sprite sheets
2015-04-25 02:55:04 -04:00
