NanakoAC
5898326034
Cooking and Reagent Fixes( #1953 )
...
Went searching for the cause of the reagent runtime issues. I don't think i found it yet, but i found and fixed a couple things that could be causing it.
Most notable is an egregious bug that caused animals' reagent holder to be nulled after they're dropped from a holder.
Also adds a little safety check to recipes which may fix it.
Fixes two cooking bugs as well. One that was allowing extra containers to be inserted into an already-full oven (they nested inside other containers, it was messy) and a tiny issue with batter overlays being incorrect on cooked meats.
2017-03-21 06:50:40 +02:00
NanakoAC
67bb388a5a
Additional Pylons ( #1870 )
...
This PR adds a new utility mechanic for the cult. Pylons can now be upgraded into arcane defensive turrets, which fire bolts of demonic energy. These turrets are entirely automated, somewhat-rapid firing, extremely accurate and quite long ranged, but their damage is very low, and thus their total DPS, even with the fire rate, is still far lower than most real ranged weapons.
2017-03-19 00:06:36 +02:00
Lohikar
263bb7ab8d
RnD & Cat fixes ( #1913 )
...
changes:
bugfix: "Fixed an issue where some objects could not be deconstructed with RnD."
bugfix: "Helmet lights now actually display the powered-on sprite."
bugfix: "Cats on heads no longer magically turn invisible."
bugfix: "Cyborgs' portable destructive analyzer can no longer steal intercoms or the captain's safe."
imageadd: "Duffle (duffel?) bags now have in-hand sprites."
Fixes #1158
Fixes #1662
2017-03-12 12:18:58 +02:00
Lohikar
7cc68feeb4
Remove holder access ( #1906 )
...
changes:
Mob holders no longer grant that mob's access.
Fix bug where wrong task was killed on invalid head in scheduler.
Fixes #1785
2017-03-12 12:18:09 +02:00
NanakoAC
6e16ad88ff
Nanako's cooking rework ( #1743 )
2017-02-17 20:08:45 +02:00
NanakoAC
d8a421ae0a
Holder Icon fixes and Pai Tweaks ( #1344 )
...
Fixes lots of things not having proper icons, especially the monkey subspecies
Makes a lot of holder sprites use contained sprites properly instead of being distributed across many files
Disables picking up LF's new Vkrexi things, because they don't have sprites for it
Searched through all the bay holder icons and made sure the new ones all work, i grabbed a few from the upstream bay repo too. Held sprites for mice and construction drones!
Makes hats work properly on held drones and nymphs
Ports and implements all the new pai held sprites. Reworked pai interactions a little to allow picking them up, as well as petting/kicking/etc.
Moved pai collapsing to alt click, so it wont happen accidentally
2016-12-30 20:37:14 +02:00
NanakoAC
4e5556e9d9
Mouse Skeletons ( #1279 )
...
Adds decomposing animations for mice when dusted. They'll leave behind a little mouse skeleton
Mice and lizards will decompose to a skeleton 30 mins after death, or if dusted
Also some fixes to various small issues and runtime errors related to held mobs and supermatters.
2016-12-23 20:52:27 +02:00
NanakoAC
580d7a2bcc
Resomi icon fix ( #1267 )
...
Fixes resomi icons, worn, held, etc
Uses some runtime icon inserting witchcraft. i spent several hours studying dm documentation
2016-12-22 17:55:57 +02:00
NanakoAC
d19c62c081
Cargo. Event, Holder fixes ( #1253 )
...
Fixes runtime errors with cargo stock. Was caused by the type of armor boosts changing.
Probably fixes the issue of mobs dying when picked up. I added some robustness and safeties to it
Tweaks event probabilities, adjusting the major event distribution (rarer bears), raising some others and slightly reducing the overall chance of major events.
2016-12-21 21:39:22 +02:00
NanakoAC
f7476fa9d7
Nanako's compile fixes ( #25 )
...
Various compile error fixes. windoor stuff, ID, emag, holders marked for farther fixing later.
nothing too remarkable
2016-11-30 18:28:58 +02:00
skull132
f75e1f3cca
Indentation clearance + basic compiles
...
Due to missing includes, primarily.
2016-11-12 01:02:50 +02:00
skull132
e9b688e1f6
Merge branch 'development-2' into development
...
Christ on a stick. SO MANY ERRORS. REEE.
# Conflicts:
# baystation12.dme
# code/_helpers/lists.dm
# code/_helpers/logging.dm
# code/_helpers/text.dm
# code/_onclick/click.dm
# code/controllers/configuration.dm
# code/controllers/master_controller.dm
# code/datums/supplypacks.dm
# code/game/antagonist/antagonist.dm
# code/game/antagonist/antagonist_print.dm
# code/game/antagonist/outsider/commando.dm
# code/game/antagonist/outsider/ninja.dm
# code/game/area/areas.dm
# code/game/gamemodes/cult/cult_items.dm
# code/game/gamemodes/game_mode.dm
# code/game/jobs/access.dm
# code/game/machinery/atmoalter/canister.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/mecha/mech_fabricator.dm
# code/game/mecha/mecha.dm
# code/game/objects/effects/spiders.dm
# code/game/objects/items.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/flash.dm
# code/game/objects/items/devices/lightreplacer.dm
# code/game/objects/items/devices/paicard.dm
# code/game/objects/items/devices/scanners.dm
# code/game/objects/items/devices/suit_cooling.dm
# code/game/objects/items/devices/uplink.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/toys.dm
# code/game/objects/items/weapons/cards_ids.dm
# code/game/objects/items/weapons/handcuffs.dm
# code/game/objects/items/weapons/manuals.dm
# code/game/objects/items/weapons/material/kitchen.dm
# code/game/objects/items/weapons/material/misc.dm
# code/game/objects/items/weapons/material/swords.dm
# code/game/objects/items/weapons/melee/energy.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/scrolls.dm
# code/game/objects/items/weapons/storage/belt.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/tools.dm
# code/game/objects/objs.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/janicart.dm
# code/game/sound.dm
# code/game/turfs/simulated.dm
# code/game/verbs/ooc.dm
# code/global.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/verbs/modifyvariables.dm
# code/modules/client/client procs.dm
# code/modules/client/preferences.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/head/hardhat.dm
# code/modules/clothing/head/helmet.dm
# code/modules/clothing/head/jobs.dm
# code/modules/clothing/head/misc_special.dm
# code/modules/clothing/shoes/jobs.dm
# code/modules/clothing/spacesuits/alien.dm
# code/modules/clothing/spacesuits/captain.dm
# code/modules/clothing/spacesuits/miscellaneous.dm
# code/modules/clothing/spacesuits/rig/rig_pieces.dm
# code/modules/clothing/spacesuits/rig/suits/alien.dm
# code/modules/clothing/spacesuits/spacesuits.dm
# code/modules/clothing/spacesuits/void/merc.dm
# code/modules/clothing/spacesuits/void/void.dm
# code/modules/clothing/suits/armor.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/clothing/suits/storage.dm
# code/modules/clothing/suits/utility.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/clothing/under/jobs/security.dm
# code/modules/economy/Events.dm
# code/modules/economy/Events_Mundane.dm
# code/modules/economy/economy_misc.dm
# code/modules/events/blob.dm
# code/modules/events/event.dm
# code/modules/events/event_container.dm
# code/modules/events/event_manager.dm
# code/modules/events/money_lotto.dm
# code/modules/events/prison_break.dm
# code/modules/events/spacevine.dm
# code/modules/hydroponics/trays/tray.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/emote.dm
# code/modules/mob/holder.dm
# code/modules/mob/language/station.dm
# code/modules/mob/living/bot/cleanbot.dm
# code/modules/mob/living/carbon/alien/diona/diona.dm
# code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
# code/modules/mob/living/carbon/give.dm
# code/modules/mob/living/carbon/human/emote.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/inventory.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/outsider/vox.dm
# code/modules/mob/living/carbon/human/species/station/golem.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/carbon/metroid/metroid.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defense.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/admin.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/drone/drone.dm
# code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
# code/modules/mob/living/silicon/robot/emote.dm
# code/modules/mob/living/silicon/robot/robot_items.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# code/modules/mob/living/silicon/silicon.dm
# code/modules/mob/living/simple_animal/bees.dm
# code/modules/mob/living/simple_animal/friendly/cat.dm
# code/modules/mob/living/simple_animal/friendly/corgi.dm
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# code/modules/mob/living/simple_animal/friendly/mouse.dm
# code/modules/mob/living/simple_animal/friendly/spiderbot.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob.dm
# code/modules/mob/mob_grab_specials.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_alien.dm
# code/modules/organs/organ_external.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/ammunition/boxes.dm
# code/modules/projectiles/ammunition/bullets.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/guns/energy/rifle.dm
# code/modules/projectiles/guns/energy/special.dm
# code/modules/projectiles/guns/projectile.dm
# code/modules/projectiles/guns/projectile/automatic.dm
# code/modules/projectiles/guns/projectile/pistol.dm
# code/modules/projectiles/guns/projectile/revolver.dm
# code/modules/projectiles/guns/projectile/shotgun.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/projectiles/projectile/special.dm
# code/modules/reagents/reagent_containers.dm
# code/modules/reagents/reagent_containers/food/drinks.dm
# code/modules/research/designs.dm
# code/modules/research/destructive_analyzer.dm
# code/modules/research/rdconsole.dm
# code/modules/spells/artifacts.dm
# code/modules/spells/spellbook.dm
# code/modules/tables/tables.dm
# code/world.dm
# config/example/config.txt
# icons/mob/items_lefthand.dmi
# icons/mob/items_righthand.dmi
# icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
Bedshaped
0dba7bc83f
67 errors, 0 warnings ( #4 )
2016-10-16 12:34:07 +03:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
NanakoAC
8f78899a8d
Fixes #915 ( #917 )
...
Fixes a number of extra bugs i caused in the process of fixing animal damagetype caching. No changelog is intentional, just merge in
2016-09-13 15:47:28 +03:00
NanakoAC
a5478a5360
Animal Tweaks: Second attempt ( #849 )
...
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5
# Conflicts:
# code/modules/mob/living/living.dm
* REMOVED VENT THINGS FROM CHANGELOG
* switch statement for helper
2016-09-12 07:06:40 +01:00
NanakoAC
e240def2bf
Contained Sprites v2 ( #758 )
...
Overhauls the contained sprites system to be feature complete in terms of what it can do and offers. Now almost all cases of clothing and other items may use the system properly.
2016-08-25 16:55:42 +02:00
NanakoAC
f5d78bf420
Emergency mouse fix ( #739 )
2016-08-13 13:35:25 +03:00
NanakoAC
9d58b77e18
Fixes #721 , fixes #710 , fixes #706 ( #731 )
2016-08-12 23:00:27 +03:00
NanakoAC
468243db7e
Held Mob Fixes ( #691 )
...
changes:
bugfix: "Animals climbing onto people will now show a different, correct message, instead of the scooped one"
bugfix: "Fixed an issue where a held animal could be duplicated"
bugfix: "Fixed animals bugging out when placed in crates or unworn containers"
Also removes some unnecessary scooping code from a few animals, which already exists in the parent class
2016-08-06 03:20:38 +03:00
NanakoAC
c7a5186ef3
pAI and Held Mob Locations ( #510 )
...
Fixes #489
2016-07-12 15:11:35 +03:00
NanakoAC
b0f7a54aa3
Fixes #477 , fixes #478 , fixes #481 ( #483 )
2016-06-28 00:14:36 +03:00
NanakoAC
049c9f9b90
Smallcreatures ( #380 )
...
Most small animals can now be scooped up, including mice, lizards, chickens, chicks, kittens and walking mushrooms. All scoopable animals now have an individually appropriate size set, which determines whether they can fit in pockets/boxes/backpacks/trashbags, etc.
Small animals now have a density of zero, allowing them to move under people, or be walked over, without blocking the tile.
Scooped critters can now be petted or crushed while held in your hands, using help/harm intent.
Drones and nymphs can now be petted while not-held They are picked up by dragging them onto yourself.
Dead cats can be picked up.
Tabby cats now look correct when held in hand.Medical Records Laptops and Employment Records Consoles are no longer solid. Creatures that can walk on tables, can walk on them.
2016-06-23 02:05:46 +03:00
PsiOmegaDelta
31640fc2a3
Can now click held mobs to view their inventory.
...
🆑
add: Can now click held mobs, such as Pun Pun, to view their inventory.
/🆑
Fixes #11437 once and for all.
2016-01-28 09:29:05 +01:00
Hubblenaut
a89c066905
Fixes onmob icons for holders
...
Conflicts:
code/game/objects/items.dm
2016-01-08 14:47:08 +01:00
Zuhayr
f7109f8fa8
Cleaning up some holder/scoop/climbing code.
2015-12-29 16:10:27 +10:30
Zuhayr
b3d1ed5985
Removing a world that snuck back in after rebase.
2015-12-01 21:41:17 +10:30
Zuhayr
6b2a24841b
Holders now pass on their contained mob's ID card.
2015-12-01 21:23:11 +10:30
Zuhayr
8fa345f24a
Diona nymphs and fruit are now able to be holstered.
2015-11-20 19:36:15 +10:30
Zuhayr
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
Zuhayr
bd76f977da
Added a complex holder for human mobs + example icons (for an unadded species)
2015-09-01 11:39:22 +09:30
Zuhayr
ac04bdfb52
Readded monkey scooping.
...
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
2015-08-31 07:01:56 +09:30
Kelenius
6ba41bbc2a
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
code/__defines/research.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha_parts.dm
code/modules/research/designs.dm
maps/exodus-1.dmm
2015-08-21 16:59:57 +03:00
Zuhayr
4674333143
Minor holder refactor.
2015-08-13 17:31:42 +09:30
Zuhayr
0104de03d4
Allows pAIs to be scooped up and worn as hats.
...
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9
Removed several unneeded icons from inhands, split holder icons into their own file.
2015-05-26 14:05:21 +09:30
PsiOmegaDelta
ccf5945944
Merge pull request #9362 from Kelenius/ofResearchAndPrototypes
...
Updates to science
2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb
Merge pull request #9293 from RavingManiac/dev
...
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/modules/mob/living/carbon/brain/posibrain.dm
2015-05-25 20:35:46 +03:00
Hubblenaut
7a8bbab694
fixup
2015-05-24 15:39:43 +02:00
Hubblenaut
a7ad448293
mice are pickup-able
2015-05-22 17:59:06 +02:00
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
RavingManiac
53eec427dc
Typo fix. Obsolete viisible_message() hack removed from mob holders
2015-05-17 17:15:27 +10:00
RavingManiac
c67ed25b85
visible_message() now affects objects. Holopads, pAIs, AI cards people in mecha should hence be able to see them
...
Tape recorders record hearable emotes and action messages
Human and robot emotes now use custom_emote()
2015-05-16 16:01:41 +10: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
db30c15e4c
Updates to science
...
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Zuhayr
efa6f0d3c9
Finalized monkey species definitions and icons.
2015-03-26 14:45:41 +10:30
mwerezak
b71f6c1121
Partial breathing refactor
...
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
Chinsky
b730e8309e
Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance.
2015-03-07 16:03:43 +03:00
Chinsky
fae7d1c9e9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/monkey/monkey.dm
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-07 15:18:54 +03:00
