Commit Graph

410 Commits

Author SHA1 Message Date
Aranclanos 53a02296df Merge pull request #1989 from Perakp/dnaDecon
DNA scanner and cloning pod deconstruction
2013-12-17 20:44:16 -08:00
KazeEspada 7513625c48 fixes a rare runtime that occurs when the turbine couldn't find a compressor. Brings the code up to current standards. Removes the view function from the computer. Its rather obsolete in the days of telescreens. 2013-12-15 17:38:23 -07:00
EuroNumbers e9e9977249 Standarized the code further, added interact that doesn't shit the compiler 2013-12-15 19:23:54 +01:00
Perakp 5d1f63f924 <span> and cable use()
- Added more span tags
- using cable now uses use()
- fixed use() to correctly return 1 when it succeeds
- checked that there were no checks that would’ve been previously
borked. For testing purposes I renamed use to use_cable (‘use’ is kinda
bad for a proc name, but use_cable is hardly better), but left that out
of the commit because it would’ve inflated the pr.
2013-12-15 12:07:55 +02:00
EuroNumbers 279e84f12b Updates turbine.dm to bypass the 'code\modules\power\turbine.dm:234:error: interact: duplicate definition' 2013-12-14 20:16:25 +01:00
EuroNumbers 29d637240f Update turbine.dm
Replaced outdated code that wounded up there for no reason.
2013-12-09 01:25:10 +01:00
EuroNumbers 64c08c6482 Update turbine.dm
Made compatible with LINDA
2013-12-09 00:17:03 +01:00
EuroNumbers 372992ca36 Lowercased "gas turbine control computer" 2013-12-08 22:47:29 +01:00
EuroNumbers c2a4de92cc Update turbine.dm
Turbine now works as intended in rev4407
Tweaked the power generation too to fit the increased demand
Still needs a better computer code
2013-12-08 21:33:25 +01:00
Perakp ce9f29fb86 Applied logic to portable generator deconstruction. 2013-12-07 09:27:56 +02:00
Perakp b8a7957a22 Adds deconstruction for DNA scanner and cloning pod.
Adding wires to a machine frame uses one unit of wire.
Wires returned from deconstructing return 1 unit of wire.
Fixes issue #1001
2013-12-07 08:55:07 +02:00
Rockdtben 9492f102b9 Merge pull request #1903 from YotaXP/Fix-Borg-APC-Access
Fixes Cyborg APC Access
2013-11-29 15:09:13 -08:00
Aranclanos 3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2013-11-26 22:03:26 -03:00
Giacom a468abd766 Merge pull request #1812 from LaharlMontogmmery/Unanchored-AI
AI can now anchor/unanchor itself. Goes with Malf AI pinpointer tracking once it activates Delta for balance reasons. Please review/merge if satisfying enough.
2013-11-26 12:15:47 -08:00
YotaXP d6b3b3a8bd Removes the redundant server side validation that restricted cyborg access to APCs.
Fixes the graphical bug that occurs when an AI mouses over the interface lock buttons.

Removes some remnants of the previous UI implementation.
2013-11-25 20:37:37 -05:00
Giacom 5322a6cb62 Merge pull request #1810 from Rockdtben/APCServerSideValidation
APC Serverside Validation
2013-11-21 11:51:15 -08:00
Laharl Montogmmery c9649138e6 Add a check for Delta in the shunt tracking code.
This is to avoid the AI being tracked by the pinpointer before Delta is
triggered.
2013-11-20 23:07:36 +01:00
Aranclanos 5da1b56a53 Merge pull request #1712 from havocx42/ToPush
Update for power code to remove some bugs and fix some functionality
2013-11-20 00:06:50 -08:00
Laharl Montogmmery ec8f753545 Delta : Pinpointer now points toward the AI.
Pinpointer now points in the malf AI direction (so it won't track
innocent AIs), and follow it through shunting, or if it goes back to its
core after shunting.

Bloody hell was it a pain to just test that.
2013-11-20 00:11:27 +01:00
Rockdtben 577daaedda Woops 2013-11-18 21:35:14 -06:00
Rockdtben 2097c8068b Removed useless parameter 2013-11-18 21:34:37 -06:00
Rockdtben 3c8426eb6f Corrected a mistake. 2013-11-18 21:30:50 -06:00
Robson Richards e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Rockdtben f2acf55c5c APC Serverside Validation 2013-11-17 10:20:53 -06:00
Kyrah Abattoir 560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
2013-11-16 22:15:50 +01:00
Robson Richards 637c3f7f63 Fixes for @Aranclanos
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
2013-11-16 18:13:41 +00:00
Cheridan db0901db10 Merge pull request #1751 from Miauw62/imalazyass
Fixes missing !'s and inverted messages.
2013-11-11 18:48:37 -08:00
Miauw 0a18413fb6 Fixes missing !'s and inverted messages. 2013-11-10 21:42:32 +01:00
YotaXP 139d045b0c Implements NanoUI for APCs, and make a couple other tweaks to the NanoUI framework.
AI can also toggle the APC lock for human access.
2013-11-09 22:02:06 -05:00
Robson Richards b2b6a9ff84 Fixes Chem healing and Chem damaging of Robotic limbs
Hey @Cheridan NO ISTYPES! :D
Ugh.. I mean "Removes" 10 totally unnecessary istypes
Fixes the healing of robotic limbs so that the message actually doesn't display now.

Credit to ACCount12 for digging around and finding some nifty code
that my brain never thought of
2013-11-10 01:55:40 +00:00
Miauw 3f8f3c971a Undoes changes to emitter.dm & field_generator.dm in my other commits, then applies bugfix. 2013-11-09 15:35:40 +01:00
Miauw 5ad9505ef4 [MAP]Fixed space-fastening properly.
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
2013-11-09 14:42:54 +01:00
Laurence Reading 4cb9f66164 making propagate_network non recursive 2013-11-08 00:09:30 +00:00
Laurence Reading ce24949ace creating a get_marked_connections method for machines that doesnt check for powernet==null 2013-11-08 00:09:19 +00:00
Laurence Reading e179e44b09 clarified a comment 2013-11-06 22:35:36 +00:00
Laurence Reading 589c1e6cfb Update for power code to remove some bugs and fix some functionality
Functionality
========
*Cables can now be placed across each other and not connect, just like cables placed in the map editor.
*Alternately by leaving a "node" or "dot" in both cables you can have these cables connect

Bugs Fixed
=======
*Unconnected cable networks which share the same powernet and power are no longer created when adding cable to nodes or removing nodes on top of smooth cable

Code changes:
==========
*Adds denode proc that should be called when a wire is added to causing it to no longer be a "node" (i.e. terminates in the centre of the turf)
*Adds propagate_network proc that traverses the graph adding every cable to a new network while removing the old one
*Adds call to denode in the cable_join proc
*Fixes mergeConnectedNetworksOnTurf() to only connect cables that are both nodes
*Adds a get_marked_connections() proc to cable which finds all edges connected to it's endpoints regardless of whether they have a powernet(as opposed to get_connections())
2013-11-06 20:17:56 +00:00
Robson Richards a9b725db2f Lot's of stuff, Read full Commit log
Cybernetic limbs
Multi-location operations
Limbs have sprites now (They never dropped before so it was irrelevant)
No Organic healing of Robotic limbs (But the message is still there, fixing soon)
No "organic" diseases in Robotic areas
No more operations in robotic areas - Cheer's Pete for the surgery system being so nice
Healing Robotic limbs with welders (brute) and cable (burn)
Probably other things I forget
2013-11-01 19:44:07 +00:00
Aranclanos 033248d216 Merge pull request #1648 from Giacom/field_gens
Field Generator/Containment Field Changes [MAP] (Fixes #205)
2013-10-30 04:29:19 -07:00
Giacomand 84248eb6ab Made containment fields shock you when you walk into them, not when you walk near them.
Field generators, that are active, will now shock you; they did before but it was because of the containment field near it.
Changed the type path of the field generator and containment field:

/obj/machinery/field_generator -> /obj/machinery/field/generator
/obj/machinery/containment_field -> /obj/machinery/field/containment

Changed the map to have the new type paths.
The containment field will now shock you when it is created.
The containment field layer is a little above objects, so objects going through are under the field icon.
Cleaned up a bit of the code.
2013-10-25 15:01:04 +01:00
Aranclanos a3bbc89b96 Removed a colon from APC code on a really weird case of MALF AI YAY THAT SHIT
anyways it won't runtime anymore
2013-10-23 07:47:47 -03:00
Aranclanos dd281bb6b2 Merge pull request #1561 from RobRichards1997/11/10/2013-Limbs-are-Objects
Changes Limbs into Objects [Merge/Give Feedback]
2013-10-22 00:41:09 -07:00
Robson Richards 1c70008d0c Changes Limbs into Obj's
Reworked all the paths for it
Reworked all the procs for it
2013-10-11 19:11:55 +01:00
KionX 8264a317ea Fix warming 2013-10-10 12:51:54 -07:00
Mloc-Argent 79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Cheridan e029c078ef Merge pull request #1478 from Miauw62/variousfixes
Various Fixes
2013-10-05 12:04:13 -07:00
Miauw 4adf4fa4e9 Improved APC fix: breaker can be toggled regardless of power, power can be set to off or auto when there's no power instead of only off. 2013-10-04 20:14:07 +02:00
Miauw 67e7eb86bd You can no longer turn on depleted APCs for a split-second 2013-09-29 14:31:26 +02:00
Aranclanos 05e894751a Merge pull request #1413 from JJRcop/nar-sie-red-alert-fix
Fixes corner-case exploit regarding nar-sie and red alert
2013-09-28 15:47:15 -07:00
JJRcop 2524cc00c1 Fixes corner-case exploit regarding nar-sie and red alert
Changes the time the shuttle comes with a nar-sie to 3 minutes, as Centcom
is probably rushing anyway because there is a giant unidentified god
running around the station.
2013-09-25 12:22:49 -04:00
Cheridan a1d3680ca2 Merge pull request #1434 from fleure/coils
Fixed cable coils disappearing when combined
2013-09-23 20:59:27 -07:00