Commit Graph

148 Commits

Author SHA1 Message Date
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
Neerti
70cda5e3be Adds a few new posters. 2015-07-16 21:12:43 -04:00
PsiOmegaDelta
772488fadc Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
Chinsky
5754c4edf7 Fixes #9211
Instead of several minutes long spawn, blood is added to processing for drying out now. Processing proc itself is just compraing two vars so shouldn't be as bad.
This way it doesn't get referenced by unnamed proc and can be qdel'd properly.
2015-06-17 06:50:08 +03:00
GinjaNinja32
94e19592cf objects/effects, objects/structures 2015-05-30 14:37:40 +01:00
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Mloc
16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01: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
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
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
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02: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
Kelenius
41ff9819bd Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
Kelenius
b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
MrSnapwalk
cb0ec5abe4 Adds 7 new posters. 2015-03-06 21:14:32 -06:00
PsiOmega
3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
2015-03-05 09:20:20 +01:00
PsiOmega
8f929331d8 Fixes #8343
Fuel no longer attempts to spread itself after having been deleted.
2015-03-03 15:33:15 +01:00
Chinsky
81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire
Implements liquid fuel fires
2015-03-03 10:31:49 +03:00
mwerezak
49b3db964f Implements fuel fires
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
2015-03-02 12:40:01 -05:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr
5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zuhayr
c789f58b3c Converted seed genetics over to a macro-based list of traits 2015-02-04 10:47:24 +10:30
Zuhayr
26fe1a11a4 Adds exploding fruits. 2015-02-04 10:39:14 +10:30
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
Kelenius
080dfc7850 Removes duplicated code from blood decals 2015-01-04 00:59:33 +03:00
Kelenius
1ac8beb18d Makes floorbots clean footprints, makes footprints dry out
Fixes #5944
2015-01-04 00:20:00 +03:00
mwerezak
6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/turfs/simulated/walls.dm
2015-01-01 15:46:23 -05:00
mwerezak
9485c6410c Fixes #7598 2015-01-01 15:43:28 -05:00
PsiOmega
1047a75da4 Makes remains movable/cleanable.
It's now possible to move remains around.
Non-robotic remains can be poked to turn them into ashes. The ash can then be cleaned up.
2014-12-12 11:52:30 +01:00
mwerezak
f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
mwerezak
5b1f7695e3 Remaps the nuke ops shuttle for station docking
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Whitellama
da93b893ce Fixed silly typo. 2014-08-17 03:03:17 -07:00
Whitellama
4bfd59c8d7 Renamed an argument to h ave clearer meaning. 2014-08-17 02:54:35 -07:00
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Hubblenaut
c0ae74b813 Fixes non-existant feet getting bloodied and adds blood to wheelchairs 2014-07-02 22:34:50 +02:00
RKF45
1cfd0c3342 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters
Conflicts:
	code/game/objects/effects/decals/posters/bs12.dm
	icons/obj/contraband.dmi
2014-04-19 19:24:45 +02:00