Commit Graph

1907 Commits

Author SHA1 Message Date
Cael Aislinn 6661ce81b9 Merge pull request #1205 from dumpdavidson/emp_overhaul
EMP-kit
2013-08-23 06:57:51 -07: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
Cheridan d44873546f Merge pull request #1183 from Tenebrosity/consistenttimeanddate
Fixed #721 - Consistent time and date
2013-08-22 22:35:16 -07:00
dumpdavidson 5b6c126a1a Adds EMP implant.
Replaced the EMP grenades from the uplink with an EMP kit.
The kit contains a grenade, an implant and a flashlight with 5 uses that can EMP any object or mob in melee range.
2013-08-21 21:48:37 +02:00
dumpdavidson 55f7f2a1d5 Adds a special flashlight that can be used five times to directly inflict strong EMP on an object or mob at close range. 2013-08-21 20:51:02 +02: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
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
Jesus Hussein Chris 51e4c0bb3f Merge branch 'master' of https://github.com/tgstation/-tg-station into time 2013-08-18 11:03:13 +12:00
Cael_Aislinn 194a98736f makes pugs orderable via cargo bay
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-08-17 10:13:08 +10:00
Jesus Hussein Chris 2756405cd2 Makes times and dates consistent. Adds date to PDA. 2013-08-17 04:19:41 +12:00
Cheridan 756cf79f1c Merge pull request #1154 from Giacomand/blobtweaks3
Made tweaks to blob based on feedback.
2013-08-14 22:28:50 -07:00
Giacomand 1a19dd6142 Merge pull request #1114 from Carn/data_records
Helper proc /proc/find_record(field, value, list/L)
2013-08-14 16:35:04 -07:00
Giacomand cc6f37e94d Merge branch 'master' of https://github.com/tgstation/-tg-station into blobtweaks3
Conflicts:
	html/changelog.html - Resolved
2013-08-14 01:13:38 +01:00
Giacomand 2a24846001 * The blob will now destroy items. 2013-08-14 01:11:09 +01:00
Cheridan 92286e56b6 Merge pull request #1100 from Malkevin/Cargo_PhaseOne
Cargo Overhaul: Phase 1
2013-08-12 22:02:28 -07:00
carnie ffa9bb51cd Helper proc /proc/find_record(field, value, list/L)
It will search list/L for a /datum/data/record with fields[field] == value, and return it.

This removes a vast amount of copypasta (there's still so much left in there though). It also removes all the locate(\ref[record]) I could find, which were normal used with topic(), meaning it was susceptible to abuse.

Secbots, ed209s and turrets are now smarter with their record-checks. They now prefer to use our face-name rather than id-name. ICly, this is the bot using facial recognition. This fixes an issue where it'd try to use the name variable which could be in the format "Unknown (as their id name)" when they were disfigured, etc. causing record-lookup to fail.

Additionally, these bots will treat those without a valid record in the security database, to be treated like criminals.
2013-08-11 12:49:55 +01:00
Cheridan 5f2e14cd55 Merge pull request #1094 from Giacomand/cham_cleanup
Chameleon Projector Cleanup
2013-08-10 21:26:32 -07:00
Aranclanos 0ce01d1583 Adding Linda. 2013-08-10 06:15:14 -03:00
Malkevin 9eaf89b3aa Cargo Overhaul: Phase 1
-Ported Bay's cargo computer category system

-Created a box containing six flashes

-Crates have been tweaked significantly. Crates have been reduced to single item types where possible, namely with expensive crates such as weapons and armor. A total of 28 new crates have been added, including chemical and tracking implants, and raw materials can also be bought from cargo for a significant number of points (subject to change)
2013-08-10 02:51:16 +01: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