cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,761 Commits 74 Branches 23 Tags
cb1535dc7bcd6d1dc3fe10c6210ff7dbd26ae74d
Commit Graph

91 Commits

Author SHA1 Message Date
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
Zuhayr
d0f76833d9 Fixes #7976 2015-01-29 11:15:18 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
Zuhayr
70fe00e1c1 Updated borer icons slightly. 2014-07-30 21:51:17 +09:30
Zuhayr
dac4e3432e Adjusted borer spawns/options/vars. 2014-07-30 21:08:54 +09:30
Zuhayr
f1d83d3f94 Fixed some vox icons. 2014-07-01 07:29:30 +09:30
Chinsky
dfcff0468c Allows monkeys to be scooped up too. 2014-06-24 15:14:17 +04:00
Chinsky
481f3caec5 Moved scooping into a separate helper. 2014-06-24 13:46:15 +04:00
Zuhayr
b67bb6470d Made cats pick-up-able. 2014-06-24 14:41:08 +09:30
Zuhayr
56bdd108f9 Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag. 2014-05-18 10:59:47 +09:30