Commit Graph

48 Commits

Author SHA1 Message Date
HarpyEagle
78cd94b113 Fixes #12877 2016-06-20 00:10:25 +01:00
Arokha Sieyes
747e6322be Removes "Teshari Eraser" Feature
Oops. Didn't quite math that one out in my head I guess.
2016-05-19 17:58:21 -04:00
Arokha Sieyes
b91065dabb Makes items fall through holders
As in, scooped mob holders, like Teshari. If they throw an item, it falls out now rather than being trapped and eventually deleted in their holder object.
2016-05-16 16:11:24 -04:00
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Zuhayr
51842ce8fa Corrects several Teshari code and icon issues. Makes Teshari suits available in the cycler. 2016-02-13 14:35:38 +10:30
Zuhayr
81a6d9ddbf Should fix Teshari stripping intent bugs. 2016-02-08 10:29:32 +10:30
Zuhayr
19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Zuhayr
58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486 Revert "Removes Resomi."
This reverts commit c9f579e00a.
2016-01-27 13:48:48 +10:30
Zuhayr
1579f4c724 Removing a world that snuck back in after rebase. 2016-01-08 23:20:53 +10:30
Zuhayr
b174b68e0a Holders now pass on their contained mob's ID card. 2016-01-08 23:18:42 +10:30
Zuhayr
80e4235c68 Unifying mob scooping, removing some unneeded boilerplate. 2016-01-08 22:17:05 +10:30
Zuhayr
763a4b88e7 Allows held mobs to see messages. 2016-01-08 21:40:02 +10:30
Zuhayr
e3735bfbee Cleaning up some holder/scoop/climbing code. 2016-01-01 10:30:05 +10:30
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Zuhayr
d2e092c899 Diona nymphs and fruit are now able to be holstered. 2015-12-11 15:52:22 +10:30
Hubblenaut
9980b7ef13 Fixes onmob icons for holders 2015-12-10 19:17:13 +01:00
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
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