Commit Graph

1633 Commits

Author SHA1 Message Date
Aranclanos
6d87e5a11d Merge pull request #1389 from KazeEspada/computers
Cleans up computer code severely.
2013-09-28 14:48:42 -07:00
Cael Aislinn
4ea0fe35b0 Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire
Mobs on fire: The return: The reckoning
2013-09-28 10:00:24 -07:00
Giacomand
f5e3037e6d Merge branch 'master' of https://github.com/Giacomand/-tg-station into nobreathe
Conflicts:
	code/game/objects/effects/effect_system.dm - Resolved.
2013-09-28 01:07:20 +01:00
Giacomand
6731722bff Made blob spores a bit more useful! On death they will release a spore cloud which will slightly (0.5 per tick) damage people and cloud your vision until the effect wears off. 2013-09-27 10:24:58 +01:00
Rolan7
f7d2711753 Returns 1 instead of adding (more) special cases to the afterattack functions for beakers and spray bottles. 2013-09-24 13:37:17 -04:00
KazeEspada
27bc778449 Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-23 13:37:00 -07:00
Fleure
35ff617e6e Vending machines now list Lemon-Lime as "Orange" 2013-09-22 13:03:25 +01:00
Fleure
90e3a94b2c Added Lemon-Lime cans to vending machines 2013-09-21 21:35:11 +01:00
Cael_Aislinn
772acc95c4 mobs on fire system, by ergovisavi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-09-22 04:59:48 +10:00
Rolan7
0e758945d5 Disables the afterattack for spray bottles and beakers when applied to hydro trays so they don't splash/spray (spray bottles didn't do anything special to blobs).
Improved some text.  Empty syringe is still ready for extraction code when that gets implemented.
Fixed a double-the error.  Noticed that hydroponics code is full of them.  Cleaned them up.
2013-09-20 17:15:11 -04:00
Aranclanos
ef427aff91 Merge pull request #1318 from ACCount12/master
Shotgun dart overhaul, #1181 fixed, NOREACT flag removed from mobs
2013-09-20 00:33:36 -07:00
ACCount12
1b1e0363a4 compilation error fixed 2013-09-19 15:36:03 +13:00
KazeEspada
cbb041637b Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-17 16:43:19 -07:00
supersayu
a993ce62db Bugfixen and minor changes. Fixes #136.
Adjusts the click code to not use client/Click().  The code is largely unchanged, except that it allows the compiler default behaviour of calling atom/Click(), and then forwards the call to mob/ClickOn().  I had some reports that melee combat mixed with movement was behaving oddly, and I believe it may be due to the use of client/Click; the byond documentation says that redefining client/Click() causes additional overhead, and it isn't strictly necessary.

Alters the way double clicks are handled, in an attempt to better handle clickspam, as often occurs during pitched combat.  This may also be responsible for the above, but I don't know.

Inserts proximity (aka flag) checks in all afterattack() procs.  The old assumption was that unless an item used the USEDELAY flag, afterattack() was only called when adjacent, but this is no longer true.  This led to beakers, soap, crayons, etc, all being usable at all ranges.

Removes the NODELAY flag, which was unused.  Removes all existing uses of the USEDELAY flag so that it can be readded to things that need extra delay.

Removes the hand_* procs, previously used by restrained actions.  Instead, the mob helper mob/RestrainedClickOn() has abosrbed basically all the functionality they were used for, which is really only monkeys with jungle fever.

Adds a special case of the Adjacency() proc for doors.  This fixes #136, airlocks being unreachable due to border fire doors.  However, this only takes us back to the unpleasant position where you have to open-hand the door, switch to a crowbar, and pry open the firedoor; it still needs a better fix.
2013-09-17 18:19:14 -04:00
supersayu
475042a212 Click code rework
Fixes #646, #579, #863

Completely redoes the click code.  Moves all click related code into code/_onclick for reference.  Also moves hud datum code and all the screen object code I could find into code/_onclick/hud, as it is related.  Item attack(), attackby(), afterattack(), and attack_self() have been moved into item_attack.dm for consistency.

Completely removes dummy objects and adds atom.Adjacent(user).  This proc checks for border items and anything marked with throwpass for determining whether or not you can reach a given square.  A turf helper, ClickCross(), was added to facilitate this.

Removes the monolithic Atom.Click() proc in favor of an overridable click handler attached to mobs.  Click code no longer uses the : path operator as a consequence, and mob/lastDblClick has been moved to Client/next_click.  A few end arounds were necessary (screen objects, buildmode, and spells), but this has been handled by repurposing Atom.Click(); if you have special click code, insert it in the object's Click() function and return 1 to prevent normal processing.

This update adds support for attack_ghost(); the previous "new" click handler had support for it but was never finished.  I have taken the liberty of letting ghosts click portals, the gateway, and the teleporter to jump to the intended target square, and kept the previous default action of examine()ing every damn thing you click.  It is to be suggested that you could do more with this proc when ghost interactions are enabled.

This update also adds support for double clicking.  It is currently only used for ghosts and AIs, because the original (first) click still registers normally.  For both of these, double clicking a square will jump you to it, and double clicking a mob will follow it.  In the case of ghosts, double clicking bots and the singularity will also set you following it; if you double click your own corpse, you will re-enter it; this also works if your body is in a closet, sleeper, DNA scanner, etc.  Default mobs ignore double clicks as normal.

-- NOTE --

There are two flags which were previously unused or misused by click code: USEDELAY and NODELAY.  Ostensibly, USEDELAY would double the normal 1sec delay, and NODELAY would remove it.

Using either of these flags as intended would significantly affect the timing of the game.  In particular, USEDELAY is currently applied to guns and about everything else that acts at range.  I am adding USEDELAY as a half-second increase for now, but I have not put a significant amount of thought into it.  I considered lowering the normal 1sec delay to .8sec to balance it, but the consequences of that on combat involve more calculations than I care to make.

NODELAY seems to never have been used, and I did not implement it, but I could do so trivially.
2013-09-17 18:15:54 -04:00
KazeEspada
630a691c6d Cleans up computer code severely. fixes issue #1004. Aliens and Monkeys can now smash computers. However, this only applies to computers with buildable circuit boards. Computers without boards are now impervious to attack and deconstruction(can't steal atmos computers or slash up the escape shuttle computer).
Hologram computer has been moved to unused. It has some interesting ideas, but it needs sprites and fix up.
2013-09-17 13:22:39 -07:00
Aranclanos
640ebef2a0 Merge pull request #1341 from Incoming5643/sliming
Transformation Diseases Standardization/Black Slime Extract Changes
2013-09-15 02:53:54 -07:00
Cael Aislinn
e5aaa51396 Merge pull request #1342 from Faerdan/master
Nano UI Framework
2013-09-14 00:11:22 -07:00
ACCount12
00507c2abd Update Chemistry-Holder.dm 2013-09-14 17:45:44 +13:00
Incoming
b9586d621c Merge branch 'master' of https://github.com/tgstation/-tg-station into sliming
Conflicts:
	code/datums/diseases/robotic_transformation.dm
	code/datums/diseases/xeno_transformation.dm
	code/modules/reagents/Chemistry-Reagents.dm
2013-09-12 19:59:53 -04:00
Incoming
23c0942e71 Updated Chemistry-Reagents.dm to hopefully resolve the conflict 2013-09-12 19:10:04 -04:00
Aranclanos
95bfb86226 Merge pull request #1280 from Ergovisavi/improvexplosive
Adds createable Improvised Explosives!
2013-09-12 02:30:04 -07:00
Incoming
d515bd8d93 forgot to update the disease paths for their respective reagents 2013-09-11 23:01:02 -04:00
Mark Aherne (Faerdan)
83b419decb Added documentation for the ui_interact proc.
Moved the client nanoclose verb into nanoexternal.dm.

Removed debug comments.
2013-09-11 22:18:11 +01:00
Mark Aherne (Faerdan)
0915afda20 Minor fixes. 2013-09-11 21:24:06 +01:00
Incoming
eb79461e92 Black slime extract now inflicts a disease that turns the victim into a slime after a short while instead of immediately turning them through the chem itself. This gives people a chance to call out over radio about what happened if they were the victim of a drive-by sliming. Likewise it gives them a faint hope of reversing the process with the cure, frost oil (in the code frost oil is hilariously toxic to slimes). Source of frost oil are botany and (irony) xenobio. The disease is fast spreading, and infected are likely to only have 30 seconds to a minute to find frost oil, but it's highly effective once taken.
On the plus side for xenobiologists this allows for them to place black slime extract in things (medibots, food) without it becoming immediately apparent to victims what's been sabotaged.

This disease cannot be spread in any fashion besides black slime extract. (Because that would be so hideously broken if it was transmittable)

The flavor texts for the stages are an allusion to nethack, where the process of getting slimed is much the same (http://nethack.wikia.com/wiki/Sliming)

One other feature of note: mutant slime people retain the old black slime extract behavior, getting slimed almost immediately after exposure. This means that you can replicate pre-pull black extract by creating a mixture of equal parts black and green extract.
2013-09-10 19:12:18 -04:00
Mark Aherne (Faerdan)
ff5f4867c2 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-09-10 20:39:00 +01:00
ACCount12
0a7285e0b7 Merge pull request #1 from tgstation/master
Merging with main /tg/
2013-09-09 02:39:03 -07:00
ACCount12
c261a4f7a6 Update syringes.dm 2013-09-06 14:41:35 -07:00
Cheridan
990f2c58f3 Pandemic Replicator Indicatior Light 2013-09-06 10:38:06 -05:00
Ergovisavi
9125c53028 Improvements on improvised explosives
They now have a random hidden detonation time that ranges from 3 to 8 seconds
They now can be made from any can, and will have a different appearance based on each one

-They look goofy if you try to spawn them in with admin commands (they have no soda can to reference, so the can is invisible in the sprite) but are completely functional otherwise

Modifies reagent_containers/food/drinks in order to move all canned drinks to the food/drinks/soda_cans to bunch them all up so they are easily worked into the IED

Modifies machinery/vending due to the abovementioned moving of canned drinks from food/drinks to food/drinks/soda_cans

Modifies the map because of the above to fix filepath issues

And of course adds weapons/grenades/ghettobomb.dm for the bulk of the IED, and modifies grenade.dmi for the sprites
2013-09-01 09:18:28 -07:00
Mark Aherne (Faerdan)
de6e75c533 Merge branch 'master' of https://github.com/tgstation/-tg-station
Removed admins.txt conflict.
2013-09-01 13:42:06 +01:00
Mark Aherne (Faerdan)
a8f764099e Fixed client side UI failure caused by apostrophes in text.
Updated the Chem Dispenser UI with an Energy bar.

UIs attached to the Chem Dispenser will now update on recharge(), recharge now recharges 1 every 15 ticks instead of 2 every 30 (to make it feel more fluid).
2013-09-01 00:50:26 +01:00
Cael_Aislinn
ddf5403373 adds ghost chilis, makes condensed capsicain actually do something when ingested
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-08-31 09:56:01 +10:00
Cheridan
a15032f74a Merge pull request #1236 from KazeEspada/reagents
Reagent fix (booze, mercury)
2013-08-29 09:56:18 -07:00
Mark Aherne (Faerdan)
aa0a9bd2e3 Added Nano UI Chemistry Dispenser.
Fixed UI update issue with non auto-updating UIs.

Misc tweaks for CSS and JS for UI styling.
2013-08-28 17:12:47 +01:00
KazeEspada
603f63b5e9 Reagent fix:
Mercury now causes brain loss.

Ethylredoxane now removes ethanol from a mob.

Space cleaner no longer removes overlays. Most dirts and spots are /obj/effect/decal/cleanable's anyways.
2013-08-27 17:50:35 -07:00
Cael Aislinn
5631d144f9 Merge pull request #1217 from dumpdavidson/nosleepAI
Removal of sleep/rest verbs for most mobtypes, fix for forcefeeding brains
2013-08-23 17:24:30 -07:00
dumpdavidson
4b54dd8074 Removed sleep/rest verb from non-carbon mobs, slimes and brains.
Fixed the possibility to forcefeed brains snacks.
Removed the countdown of various status effects in brain's life() proc that shouldn't happen to brains anyway.
2013-08-23 14:12:12 +02:00
Cheridan
cc1e3d2b6d Merge pull request #1178 from caelaislinn/pugs
Adds pugs, makes pugs orderable via cargo
2013-08-22 22:52:48 -07:00
Cael Aislinn
635454486a Merge pull request #1188 from MrPerson/waterflower
Made the clown's waterflower a child of spraybottles
2013-08-19 03:18:47 -07:00
Cael Aislinn
03ff285876 Merge pull request #1184 from Scottzar/master
Adds a recipe for appendix burgers.
2013-08-19 03:11:49 -07:00
MrPerson
60e25d2b9a Made the clown's waterflower a child of spraybottles rather than having its own snowflake spraying code. As a result, clowns can refill the flower with anything and spray a single unit of reagent at people. Pepperspray is a good one. Honk honk.
Fixed "you empty the the spray bottle" message.
2013-08-18 19:41:32 -07:00
Cheridan
bfeef72660 Merge pull request #1102 from Aranclanos/Linda
Linda.
2013-08-18 15:27:23 -07:00
Scottzar
8a6d974a04 Adds a recipe for appendix burgers.
Has a custom sprite which I made, which essentially looks like the standard burger.
Currently no distinction between inflamed and non-inflamed appendixes because I don't know how to check vars without making a separate check like with human meat when processing the recipe.
2013-08-18 11:17:56 +10:00
Cael_Aislinn
21d35fb586 adds pugs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-08-17 10:12:40 +10:00
Aranclanos
0ce01d1583 Adding Linda. 2013-08-10 06:15:14 -03:00
Giacomand
eb9c372cbe * Properly renamed Soporific to Sleep Toxins, because that is what it is and it confused people who would make their patients sleep because they think it's medicine.
* Removed the actual Soporific because it was unused, non-makable and pretty useless.
2013-08-09 20:20:04 +01:00
carnie
3317aa9fe3 Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2
Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.
2013-08-06 09:54:24 +01:00
Matevž Baloh
4ce9bb13a1 Merge pull request #1058 from KazeEspada/poison
Makes alchohol poisonous,.
2013-08-05 09:20:23 -07:00