Commit Graph

3657 Commits

Author SHA1 Message Date
Miauw
c57fb1dc6e Fixed the last issues of asscopying before merge. 2013-10-26 20:42:17 +02:00
Giacom
eac041f23f Merge pull request #1614 from JJRcop/mmi-extract
Adds the ability to safely deconstruct cyborgs
2013-10-26 11:28:24 -07:00
Benjamin Read
9caceff92a adds more "complete" food, using the unfinished feeling food (such as fried egg, sausage etc)
Icons credit to chocobro/420weedscope
2013-10-27 05:12:33 +11:00
Jordie
774a4fafdd Removed duplicate var + faster movement 2013-10-27 04:17:51 +11:00
Giacomand
f44faba532 Added a voice announcement system for the AI.
Voices are based on /vg/'s female voice and are copyright free.
There is a 60 second cooldown for each announcement.
Added a compile option for AI voices. Undefining AI_VOX will not compile the resources, meaning players won't have to download them.
2013-10-26 17:56:39 +01:00
Jordie
83e2c1d706 Added bats 2013-10-27 03:55:17 +11:00
Miauw
d594a35f3c More ass copy code cleaning. Proper span classes & cleaned up helper procs. 2013-10-26 18:10:46 +02:00
Miauw
6cb72d81b9 Improves ass copy code. More ass deinitializations added. 2013-10-26 17:29:04 +02:00
Miauw
87d82a0265 You can now copy your ass on photocopiers. 2013-10-26 16:25:31 +02:00
Giacomand
83b882ed3f * Added the space violin to the service cyborg modules.
* Made the space violin usable by service cyborgs.
* You can now examine Cyborgs to see their active module.
* Made the choose module window look nicer.
2013-10-26 13:49:41 +01:00
Cheridan
f75e478354 Merge pull request #1631 from Aranclanos/MalfAIAlwaysScrewingUpThings
Removed a colon from APC code. Just one. Nothing else.
2013-10-26 02:22:18 -07:00
Aranclanos
a2981e5f9c Merge pull request #1589 from SuperSayu/clickstuff3
Mecha, hud, and click fixes
2013-10-25 09:16:54 -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
Giacom
c169113e6b Merge pull request #1636 from SuperSayu/starcrossed
Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter()
2013-10-25 04:24:42 -07:00
Giacom
8c2aa41b19 Merge pull request #1634 from SuperSayu/defines
Moved #defines
2013-10-25 04:09:30 -07:00
Giacomand
1705cc6f76 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1633 2013-10-25 12:02:37 +01:00
Giacomand
2022e1f6ed * Slightly reordered the mind check. 2013-10-25 12:02:16 +01:00
Giacomand
a1af8853be Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1640 2013-10-25 11:49:59 +01:00
d3athrow
a8a81c3326 Was hasty in the fix, much smaller now 2013-10-24 20:13:00 -05:00
Cheridan
1389603afb Merge pull request #1630 from Aranclanos/StaffOfRuntimes
Staff of Runtimes
2013-10-24 17:45:12 -07:00
Fleure
e3169ee8b9 Adds container resist proc 2013-10-24 21:30:01 +01:00
JJRcop
4992d9e4e2 Putting deconstruction code in a proc for organization and later use 2013-10-24 13:51:52 -04:00
dumpdavidson
7236f6dc0d Moved mime and clown rename code. 2013-10-24 19:05:31 +02:00
Aranclanos
8d3d006c67 Merge pull request #1624 from Giacom/aran_is_dumbo
Fixed a typo
2013-10-24 09:14:00 -07:00
Giacom
723c0ed3fd Merge pull request #1610 from VistaPOWA/roman_armour
Adds roman armour set and shield
2013-10-24 09:11:22 -07:00
Giacom
aaaed39293 Merge pull request #1559 from S0ldi3rKr4s0/fhair
Adds long bangs from my old disabilities PR
2013-10-24 09:10:14 -07:00
dumpdavidson
31aab08a80 Mimes can now rename themselves.
Stage personas are a thing for mimes as well as clowns.
2013-10-24 10:10:38 +02:00
d3athrow
ff0cc9561f Fixes protolathe href exploit 2013-10-24 00:03:53 -05:00
supersayu
799c7ad2ce Replaces atom/HasEntered() with the builtin atom/movable/Crossed()
Crossed() is a byond builtin which is called automatically when two movable atoms overlap (as a side effect of Move(), but not when loc or x/y/z is changed).  Previously, turf/Entered() iterated through all objects in the turf in order to tell them an object had entered; with this change, HasEntered() becomes redundant and can be eliminated.

This may reduce lag when a large number of objects are moving in a small space (singularity, mining conveyors, etc) but should cause no changes to functionality at all.
2013-10-23 16:20:20 -04:00
supersayu
711654c15e Moved #defines
Moves the constants from defines and compile_options files into the __DEFINES directory.  The compile options in the latter file that are actually tweakable remain in their existing file in the code directory.
Constants from DEFINES.dm, globals.dm, names.dm, and global_lists.dm have been moved into the _globalvars subdirectory.
stylesheet.dm has been moved into the interface directory since that's a better place for it.

This move contains no code changes for stock TG.  It is purely an organizational move meant to clean up hard to read code.
Some global constants that appear to be unused have been put into unused.dm, but not unticked.  This list is by no means exhaustive.

Branches should be aware that they need to move any additional defines and global constants manually.
2013-10-23 16:11:45 -04:00
Cheridan
826325ade5 Merge pull request #1612 from Aranclanos/SmallAtmosFixes
Small atmos-related fixes
2013-10-23 10:39:13 -07:00
Miauw
2bff2c944f Fixed #1628 Rudimentary transforms FROM borgs now work properly. 2013-10-23 17:53:31 +02: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
b5844f4012 the transfer_identity() proc of MMIs can now be used by any mob instead of only humans.
This will make the staff of change stop runtiming.
2013-10-23 06:59:19 -03:00
JJRcop
002496038c Cyborg construction now stores endoskeleton for deconstruction to use
When you construct a cyborg now, the endoskeleton is stored in the mob, where before it was deleted.
Cyborg deconstruction now checks if there is a stored endoskeleton. If there is, it deconstructs it. If there isn't, it spawns new parts like before.
Also, there is now a burn_out proc for flashes, since the feature was previously copypasta.
2013-10-22 16:18:16 -04:00
Giacomand
d317537144 Fixed a typo 2013-10-22 21:12:54 +01:00
JJRcop
55f49b33bd Cyborgs can now unlock themselves
New verb added that allows Cyborgs to unlock themselves if they are locked.
Cyborgs are not able to lock themselves again, and will need a roboticist or someone else with access to assist them.
2013-10-22 03:59:08 -04: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
Aranclanos
5988e4b6a6 Merge pull request #1606 from Cheridan/Map
Nuke Op Gloves: The Blackening [MAP]
2013-10-22 00:32:19 -07:00
JJRcop
07c8f3b6a1 Made cyborg deconstruction a bit harder
You now have to lock down the cyborg via a Robotics console, or cutting
the lockdown wire on the cyborg, in order to deconstruct it.
2013-10-22 00:09:21 -04:00
JJRcop
83ee7b95f5 You can now deconstruct cyborgs
This is a less destructive way to extract the MMI from a cyborg.
	Also, you can no longer use broken flashes for eyes.
2013-10-21 22:29:07 -04:00
Aranclanos
bbd1cfd389 -the number of active turfs on the status tab will be refreshed and the end of each tick and when the air controller setup finishes.
-mining rooms will be generated before the air controller is created
-changed the total of moles of the NO2 turfs from 2000 to 6000 to compensate the replacement of the canister that spawns like 36000 moles on top of it for a normal canister. I'm talking about the NO2 canister inside of the chamber in atmos. (I will replace the canister in another pull request)
2013-10-21 20:09:57 -03:00
VistaPOWA
c188c2374d Adds roman armour set and shield
Made by troots.
2013-10-21 22:43:19 +02:00
Cheridan
6080088664 Merge pull request #1587 from Ikarrus/emergency
Comms Console Update/Emergency Maint Access [MAP]
2013-10-21 12:08:38 -07:00
Robson Richards
a3e0921814 Removes super secret definitely not a proc for Augments
This should never have happened!
2013-10-21 16:06:58 +01:00
Robson Richards
9d9f642542 Makes Icon_name Redundant due to Obj Limbs
update_icons.dm altered to reflect this.
2013-10-21 16:01:58 +01:00
Cheridan
7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
Giacomand
18d2672083 Constructs are now given their spells in the constructor, instead of from the soul stone. This will allow admin spawned constructs to start with spells. 2013-10-19 20:30:32 +01:00
Cheridan
b16c18cb8a Merge pull request #1596 from AlexanderUlanH/fingerprint
DNA/Fingerprint Bugfixes
2013-10-18 23:54:50 -07:00
Cheridan
39dde554cd Merge pull request #1592 from Giacom/smartfridges
Chemistry and Virology Smart Fridges [MAP]
2013-10-17 14:08:02 -07:00