Commit Graph

1888 Commits

Author SHA1 Message Date
Cheridan 5f2e14cd55 Merge pull request #1094 from Giacomand/cham_cleanup
Chameleon Projector Cleanup
2013-08-10 21:26:32 -07:00
Giacomand c2af6e1a62 * Cleaned up chameleon projector code.
* Added a Del() to the projection which will disrupt the chameleon projector, before being deleted by acid or a drill (killing the person inside).
 * Made chameleon projectors disrupt if moved from the hand, to make it consistent. Currently you could put them in pockets but if you picked them up it would disrupt. Fixing this would involve changing all use of dropped() so instead I made them disrupt when equipped and, due to how dropped() works, when they switch hands. Lowered the disrupt cooldown to make up for this.
2013-08-09 01:00:55 +01:00
Giacomand ef5f2f4b1d Merge pull request #1077 from Carn/misc
Misc
2013-08-08 11:37:38 -07:00
Matevž Baloh 38a697b41c Merge pull request #1075 from Giacomand/syndie_menu_collapse
Added buttons to the syndie uplink which will reveal/hide the description of the items.
2013-08-06 22:11:32 -07:00
Matevž Baloh c98bb429e1 Merge pull request #1064 from Giacomand/debug_instances
Added a debug verb for counting non-turf instances during rounds.
2013-08-06 18:19:57 -07: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
Giacomand ad8c525218 * Added buttons to the syndie uplink which will reveal/hide the description of the items. [?] [X]
* Fixed being able to order items with an inactive uplink.
 * Shortened the name of an uplink item to make room.
 * Removed the (?) from the Random Item to help avoid confusion with the new buttons.
2013-08-06 05:57:11 +01:00
Giacomand d6545c57b7 Merge branch 'newaiupload' of https://github.com/MrPerson/-tg-station into newaiupload 2013-08-05 01:29:51 +01:00
Giacomand 13d76e6da2 * Added a debug verb for counting non-turf instances during rounds.
* Added a category to the kaboom verb.
2013-08-04 21:42:36 +01:00
Cheridan e6589c584e Merge pull request #1053 from Giacomand/musician_fix
Runtime fixes.
2013-08-03 10:03:45 -07:00
Giacomand ce30071077 Runtime fixes.
runtime error: Cannot execute null.on reagent change().
proc name: del reagent (/datum/reagents/proc/del_reagent)
  source file: Chemistry-Holder.dm,308
  usr: null
  src: /datum/reagents (/datum/reagents)
  call stack:
/datum/reagents (/datum/reagents): del reagent("pacid")
/datum/reagents (/datum/reagents): clear reagents()
Chemsmoke (/datum/chemical_reaction/chemsmoke): on reaction(/datum/reagents (/datum/reagents), null)

runtime error: Division by zero
proc name: Topic (/datum/song/Topic)
  source file: musician.dm,193
  usr: Tico-Tico Tambien (/mob/living/carbon/human)
  src: Untitled (/datum/song)
  call stack:
Untitled (/datum/song): Topic("src=\[0x210054cd];import=1", /list (/list))
2013-08-02 00:28:08 +01:00
Cheridan 5968200325 Merge pull request #1043 from Tenebrosity/uplinkdescriptions
- Adds descriptions to uplink items explaining their use
2013-08-01 13:46:47 -07:00
MrPerson 0a5c394b90 Merge branch 'master' of https://github.com/tgstation/-tg-station into aiupload 2013-08-01 09:40:20 -07:00
MrPerson 6c65999c91 Major refactor of AI upload modules to not be dependent on the upload computers.
Modules can just run install(target,user) and everything will work fine.
Upload computers cleaned up quite heavily. Less copy+paste. Removed that pointless "Open access panel" verb they had.
Law changing procs moved from mob/living/silicon/robot and mob/living/silicon/ai to mob/living/silicon. This means clear_inherent_laws(), add_inherent_law(), etc. This is what the new file is for. Doesn't change anything since they both had exact copies of the same procs.

NOTE: This commit doesn't change the maps, so don't checkout to this without the next one.
2013-08-01 09:34:40 -07:00
carnie e7b586a095 Replaced organ helper procs with a single more versatile and strealined one. 2013-08-01 14:42:32 +01:00
carnie 02be173c60 Renamed variables:
b_type to blood_type
h_color to hair_color
f_color to facial_hair_color
f_style to facial_hair_style
h_style to hair_style
2013-08-01 13:48:41 +01:00
Jordie0608 28ea16e498 Merge pull request #2 from tgstation/master
This had better work...
2013-07-30 06:02:28 -07:00
Tenebrosity c37c7b52ca - Adds descriptions to uplink items explaining their use, as per a post in the minor suggestions thread. 2013-07-30 02:47:22 +12:00
Cheridan ca20406884 Merge pull request #1030 from Aranclanos/WirecuttingAIs
Runtime fix for wirecutter attack()
2013-07-27 20:39:27 -07:00
Aranclanos ae8612a8b0 Runtime fix for wirecutters attack(), they now make sure that the objective is a mob/living/carbon before trying to remove any kind of cablecuffs. 2013-07-26 14:47:23 -03:00
Aranclanos 68718f527a Standarization for the candle code and now the process() of it will remove the candle from a mob properly when the wax runs out, avoiding a runtime. 2013-07-25 06:19:06 -03:00
Matevž Baloh ccae1c0457 Merge pull request #939 from Malkevin/detectivebeepski
Securitron access to the DETECT cartridge
2013-07-24 12:53:52 -07:00
Matevž Baloh 5e043a6e72 Merge pull request #973 from Incoming5643/magic
Adds a new wizard spell: Flesh to Stone
2013-07-24 12:53:08 -07:00
Malkevin 2e8a41f186 Merge branch 'master' of https://github.com/tgstation/-tg-station into detectivebeepski
Conflicts:
	html/changelog.html
2013-07-24 20:43:13 +01:00
Matevž Baloh 59ba090d80 Merge pull request #995 from Incoming5643/dice
Steping on a D4 without shoes on now acts as if you stepped on glass.
2013-07-24 12:18:49 -07:00
Matevž Baloh f36a838199 Merge pull request #846 from Aranclanos/MonkeyBags
Monkey backpack movement fix.
2013-07-24 12:04:36 -07:00
Giacomand 29424a34bf Merge pull request #905 from Aranclanos/MachineryTopic
Machinery Topic(): mob and self checks fix.
2013-07-24 01:23:30 -07:00
Jordie0608 a4e7a62b46 Commit
Borg Rechargers decon-able. RIP Badger poster
2013-07-24 15:11:52 +10:00
Incoming a99d04f88c Removed some redundant code 2013-07-22 18:34:57 -04:00
Cheridan d048acca23 Merge pull request #965 from Giacomand/ai_tracker
New Uplink Item: The AI Detector
2013-07-21 10:41:46 -07:00
Incoming ef1f2d9d75 Did what I could to make the die/shard code for this not as shitty, as implored and largely written by Aranclanos 2013-07-21 00:44:43 -04:00
Incoming f4770fe100 Steping on a D4 without shoes on now acts as if you stepped on glass.
I had this idea with the other dice stuff, but dismissed it as silly snowcode that would have just lower my odds of getting it commited. Since several people have asked for this functionality in the time since, here it is.
2013-07-20 22:35:12 -04:00
Incoming 30dfa96b23 *minor tweaks for Gia
*the statue's attackby has been relaxed so any item can whack it without checks
*The mimic's check for mobs from lapsed flesh to stone spells has been simplified
*The reason this check works is because when a statue runs out of time it locs its contents, so if the statue was inside something else (in this case a mimic) they end up in the mimic's contents.
2013-07-19 09:30:41 -04:00
supersayu 941631b664 Removes the spacevine-attack code 2013-07-18 23:22:32 -04:00
Incoming 0739ea2b97 Statue Bugfixes
*the targeting for the spell has been reworked so there's no chance of people in the same loc getting stoned instead of your intended victim. As a result of this improvement, wizards can now cast the spell on other wizards with reckless abandon
*Flesh to Stone and the Staff of Animation play nicer with each other now, no more mobs getting trapped in item mimics after escaping the statue.
*Minor tweaks to the monkey statue, which looked dumb
2013-07-18 22:45:02 -04:00
supersayu 528dd9c31a Grab fixes and scythe tweaks
Fixes the grab timer; there will now be a delay between grab upgrades.
Fixes grab process so you no longer have to spam click before it disables itself.  Fixes issue #577

Fixes issue #253:
Prevents grab and throw when the affected mob is buckled.
Prevents tabling a mob when that mob is buckled.

Prevents you from dropping scythes on a table or rack if there is a space vine in that square; it will now auto-attack the vine instead.  Also auto-attacks vines if you click the floor under them.
2013-07-17 15:50:33 -04:00
Incoming d8e55e67cb *statues are now a subclass of lockers (stripped of most its procs) to fix some inheritance problems
*statue sprites updated from "granite" to "marble" to fix some contrast problems
*statues now get their Health from their target's current health, healthy humans and monkeys will have 200 health before shattering, corgis will have 120 health. Injured targets will make for easier to smash statues.
*likewise when a mob is unstoned it will take any damage the statue took as brute damage.
*Replaced godmode with a set of vars to assure the mob's health remains constant while a statue
2013-07-17 15:07:38 -04:00
supersayu 3ac2af0e06 Fixes exploit for passing plastic flaps with a locker.
Fixes issue #254
2013-07-17 14:54:34 -04:00
Incoming b34a683334 *Adds a new wizard spell: Flesh to Stone
*Spell renders one target (choosen from list) immobile and incapable of interaction by encasing them in a breakable statue
*Effect ends after a long while (4 minutes) if the statue remains intact
*Requires robes and has a range of 2 squares, cooldown 60 seconds
*Statue can be animated by Staff of Animation, the spell will still end at the normal time
*Currently can be used on humans, monkeys, and corgis
2013-07-16 22:05:15 -04:00
Malkevin f88ffadc5f Removed all the spawn()s for PDA radio functions, seems to work fine. 2013-07-16 18:44:46 +01:00
Malkevin deb3f70dec Merge branch 'master' of https://github.com/tgstation/-tg-station into detectivebeepski 2013-07-16 18:17:55 +01:00
Giacomand 0603a090ad * Optimized how the multitool found AI cameras by using the camera chunks. 2013-07-15 10:12:52 +01:00
Giacomand 3c811c6150 New Uplink Item: The AI detector is a multitool that will turn red when an AI camera is 7 or less tiles away from the multitool. The AI detector will cost 1 TK. 2013-07-15 09:38:45 +01:00
Cael Aislinn e5344a1f94 Merge pull request #914 from Giacomand/health_ana
Updated the health analyser interface to be more usable.
2013-07-13 03:44:06 -07:00
Cael Aislinn 722d15a43e Merge pull request #916 from Aranclanos/DensityBlockingWindows
Windows attacks not being blocked by grilles and other density objects fix.
2013-07-13 03:40:22 -07:00
Cael Aislinn 1120f6475c Merge pull request #918 from Aranclanos/MopWaterCheck
Mop cleaning with fuel fix.
2013-07-13 03:39:15 -07:00
Cheridan 41351f27b0 Merge pull request #947 from Incoming5643/dice
Adds additional new dice
2013-07-12 19:39:08 -07:00
Cheridan 606c9df901 Merge pull request #940 from Malkevin/atmostechanalyzers
Atmos Analyzers added to Atmos
2013-07-12 01:01:19 -07:00
Cheridan 76ecdc817d Merge pull request #892 from Aranclanos/Grenades
Grenades: small standardization and mob sprite updates.
2013-07-12 00:51:03 -07:00
Cheridan e27d004050 Merge pull request #906 from Giacomand/blueprint_fix
Blueprint areas will now have dynamic lighting.
2013-07-12 00:23:18 -07:00