Commit Graph

9542 Commits

Author SHA1 Message Date
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
Chinsky
34bbe33030 Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +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
0e1a8051f8 Merge pull request #8996 from PsiOmegaDelta/SecureBuzzing
Now only secure airlocks buzz if access is restricted.
2015-04-28 06:26:49 +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
Chinsky
bf7dc5be9d Merge pull request #8994 from PsiOmegaDelta/AirlockPressure
Airlocks can now crush more things.
2015-04-28 06:25:23 +03:00
PsiOmega
541fff5ad2 Crushing closets or mechas will now cause damage to the door. 2015-04-27 19:02:38 +02:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
PsiOmega
a78c559f6c Merge remote-tracking branch 'upstream/master' into dev 2015-04-27 08:08:39 +02: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
PsiOmega
f6d79d121c Now only secure airlocks buzz if access is restricted. 2015-04-26 22:05:39 +02:00
PsiOmega
d0397784c0 Mech sensors should not block airlocks. 2015-04-26 21:44:05 +02:00
PsiOmega
5c993e3a31 Removes the stop effect because I don't personally care one way or another. 2015-04-26 21:42:43 +02:00
PsiOmega
7f1ed80b74 Adds power draw. 2015-04-26 21:36:24 +02:00
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
952cdda4e6 Merge remote-tracking branch 'upstream/dev' into PortableNanoUI
Conflicts:
	baystation12.dme
2015-04-26 19:40:05 +02: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
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
PsiOmega
13fd1764b2 Adds cell charge status for the pumps and scrubbers. 2015-04-26 18:30:31 +02:00
PsiOmega
c07ffeab53 Portable Pump NanoUI interface.
Ports https://github.com/d3athrow/vgstation13/pull/4142 with added Bay-flavor.
To operate once must be adjacent to the PAP.
Silicons can view the status panel from any distance they are able to access the PAP from.
This preserves the current behavior.
2015-04-26 17:44:28 +02:00
PsiOmega
e2ce3d1e01 Scrubber NanoUI interface.
Ports https://github.com/d3athrow/vgstation13/pull/4142 with added Bay-flavor.
To operate once must be adjacent to the scrubber.
Silicons can view the status panel from any distance they are able to access the scrubber from.
This preserves the current behavior.
2015-04-26 17:34:56 +02:00
Kelenius
37e2c6e109 Removes a wild unused file 2015-04-26 18:13:10 +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
Daranz
dd02f9e9f0 Fix cell charger icon not updating when cell taken out by a borg 2015-04-25 19:38: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
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
Chinsky
60e7aacf79 Merge pull request #8951 from Dennok/patch-15
floorlayer
2015-04-24 10:04:29 +03:00
Chinsky
e0da322ee3 Merge pull request #8956 from mwerezak/gametime
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
2015-04-24 10:03:06 +03: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