PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
PsiOmega
6658f52ced
Merge remote-tracking branch 'upstream/master' into dev
2015-05-04 14:56:15 +02:00
PsiOmegaDelta
d86dd60c63
Merge pull request #9064 from Loganbacca/smokeFix
...
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
RavingManiac
97adee16db
Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked
...
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
2015-05-03 21:53:02 +10:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
Chinsky
a9b1f8bfe0
Merge pull request #9042 from PsiOmegaDelta/Buttons
...
Small remote button refactor.
2015-05-02 19:50:24 +03:00
Loganbacca
6238dabf88
Chem smoke fadeOut sanity checks
...
Ported updates from /tg/ to fadeOut code. Updates written by vista-
2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b
Adds a closet breakout animation, fixes spamming the breakout proc
2015-05-01 16:19:52 -04:00
mwerezak
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279
Resist verb cleanup
...
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Chinsky
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
PsiOmega
904efa322f
Breaks up the remote door control button into subtypes, depending on what is remotely controlled.
...
Also ensures that the door button respects cut wires, etc.
2015-04-30 18:26:31 +02:00
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +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
1e457f6e34
Merge pull request #9009 from Yoshax/icanintosurgery
...
Fixes antag surgery kit
2015-04-28 07:35:58 +02: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
Chinsky
bf7dc5be9d
Merge pull request #8994 from PsiOmegaDelta/AirlockPressure
...
Airlocks can now crush more things.
2015-04-28 06:25:23 +03:00
Yoshax
aa115f5bb2
Fixes antag surgery kit
2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326
Candle burn time increased to ~30 minutes
...
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10: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
PsiOmega
19a981e961
Airlocks can now crush more things.
...
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983 .
2015-04-26 19:29:13 +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
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
Kelenius
baf19eb862
Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs
2015-04-26 15:47:38 +03:00
Zuhayr
8e0d0900d9
Merge pull request #8875 from PsiOmegaDelta/TheSummoning
...
Destroy/qdel
2015-04-26 22:14:07 +09:30
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
Zuhayr
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
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
Zuhayr
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
mwerezak
3acfe5960e
Renames inventory slot string key defines
2015-04-23 04:57:03 -04:00
