Commit Graph

9974 Commits

Author SHA1 Message Date
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
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
Zuhayr
12cb60daa3 First pass on wall refactor/mining changes. 2015-04-26 12:53:03 +09:30
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
Zuhayr
f06326556a Merge pull request #8838 from Dennok/patch-5
Pipelayer
2015-04-23 20:03:20 +09:30
Dennok
dfa0735c1d Remove .contents in loop. 2015-04-23 11:59:34 +03:00
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
7a8ae91c6a Makes crit oxyloss and malf AI time run in gametime instead of realtime. 2015-04-23 04:42:58 -04:00
Zuhayr
c7ec25e8f8 Merge pull request #8855 from comma/soundenv
Sound environments
2015-04-23 17:04:30 +09:30
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands
Updates backpacks to use the item_state overrides where necessary, fixes #8577
2015-04-23 03:26:18 -04:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
6cc8be6d90 Merge pull request #8936 from Dennok/patch-14
Automatic CableLayer
2015-04-23 07:34:00 +03:00
mwerezak
5b037670b3 Removes most instances of item_color
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
Dennok
813109af88 Add span classes 2015-04-22 23:30:46 +03:00
Dennok
b5317f398a Create floorlayer.dm 2015-04-22 23:16:20 +03:00
PsiOmega
4ce1ec1f3d Pipelayer feedback.
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
2015-04-22 16:49:54 +02:00
Dennok
dc19c22056 Fix 2015-04-22 11:27:18 +03:00
PsiOmegaDelta
7a27aece0d Merge pull request #8941 from Baystation12/master
Dev
2015-04-22 09:32:56 +02:00
Dennok
204e41a4fc Add code to CableLayer 2015-04-22 08:42:49 +03:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states
Fixes #8937
2015-04-22 05:21:03 +01:00
Dennok
ae978d6cea Create Cable Layer 2015-04-21 21:00:28 +03:00
Chinsky
bcfb746465 Merge pull request #8901 from PsiOmegaDelta/ShakeShake
Structure/table shaking.
2015-04-21 20:04:41 +03:00
Kelenius
446efb3809 Fixed attacking blob breaking logs 2015-04-21 19:57:45 +03:00
PsiOmega
eaa8e341f9 Makes it possible to shake structures people are climbing on to make them stop. 2015-04-21 17:45:09 +02:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed.
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
PsiOmega
3810bef4bf Merge remote-tracking branch 'upstream/master' into dev 2015-04-20 08:39:56 +02:00