Commit Graph

5361 Commits

Author SHA1 Message Date
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Mloc
16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286 remove the sub-area system
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
Chinsky
6b57189076 Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
Fixes #9169.
2015-05-10 18:06:22 +03:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
PsiOmega
647298e550 Fixes #9169.
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
PsiOmega
b98461c2af Station alarm monitor changes.
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
2015-05-08 11:22:29 +02:00
PsiOmega
999b0ca99d Compilation fixes. 2015-05-08 08:33:41 +02:00
PsiOmega
28d24fc8c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/atmos_control.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/modules/mob/mob_helpers.dm
2015-05-08 08:23:15 +02:00
Ccomp5950
a36acc8eba Merge pull request #9136 from GinjaNinja32/CyborgIsNotAI
Fixes cyborgs showing up as AIs in radio output for AIs.
2015-05-07 23:23:54 -04:00
GinjaNinja32
cec16d7559 Fixes cyborgs showing up as AIs in radio output for AIs.
Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same.
2015-05-07 14:48:18 +01:00
PsiOmega
7cbd72d1be Cleanup. 2015-05-07 09:09:12 +02:00
PsiOmega
10edb06036 Do not copy-paste code.
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02:00
Chinsky
af7ec5c8ad Merge pull request #9099 from StarSmasher44/patch-2
Adds Icon Caching for some Mob HUD Icons
2015-05-06 19:01:20 +03:00
PsiOmega
4602bd033f Fixes #9106.
Now only carbons can be given items, as intended.
2015-05-06 15:41:39 +02:00
StarSmasher
2a96210223 Fixes this one at least. 2015-05-05 16:47:40 +02:00
StarSmasher
b6b3548760 I'm too broken for this
Should work now.
2015-05-05 14:20:35 +02:00
StarSmasher
f69358d4f5 Removes unneeded variable
Thanks Psi for pointing that out.
2015-05-05 14:12:03 +02:00
StarSmasher
b03d5a7850 Adds Icon Caching for some Mob HUD Icons
Adds partial caching for some of the smaller HUD additions of the mobs to allow for less processing needed to constantly update the icons when needed.
Code has been tested on a live server for several weeks prior to it's shutdown, so it should work as great as it has worked for us.
2015-05-05 14:04:53 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
Chinsky
e0a903d9eb Merge pull request #9093 from Baystation12/master
Master->Freeze
2015-05-05 01:42:57 +03:00
Ccomp5950
4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos
Fixes a few log-destroying lines
2015-05-04 15:30:13 -04:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
PsiOmega
1edb39b556 Merge remote-tracking branch 'upstream/dev' into BrokenGrills 2015-05-04 14:58:24 +02: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
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
d5495870d1 Merge pull request #9045 from mwerezak/resist
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
mwerezak
3509178aa8 More resist refactoring
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04:00
PsiOmega
b34e44ab84 Mice are now numbered.
You are not a man. This should also make things easier for admins.
2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e Fixes #9044
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -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
mwerezak
19aff88b90 Fixes #9017 2015-04-28 12:22:21 -04: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
Chinsky
0ff3d9af99 Merge pull request #9005 from mwerezak/master-fixes
Fixes (master)
2015-04-28 06:26:32 +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
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
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
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2
Inventory updates
2015-04-26 20:13:21 +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