Commit Graph

291 Commits

Author SHA1 Message Date
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
Sawu
75335fcd08 Fixes missing Category 2015-01-08 04:21:17 +11:00
Sawu
feb141ca15 Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood
Conflicts:
	code/modules/research/designs/machine_designs.dm
2015-01-08 03:58:31 +11:00
Sawu
01dedd5ea2 Merge branch 'freshfood' of https://github.com/sawu-tg/-tg-station into freshfood 2015-01-07 04:39:30 +11:00
Sawu
fba1ccd697 Quickfixes
*Fixes missing recipe for experimentor
*Fixes the experimentor having the wrong board inside it.
2015-01-07 04:38:49 +11:00
Sawu
ada8b7f23f Fixes a rogue :
Makes him . instead.
2015-01-07 04:25:16 +11:00
Sawu
ad4204e43f Fixed Grammar error
sawu-tg has fixed the error!.
2015-01-07 04:04:59 +11:00
Sawu
ccce11fa6e Nerfed the Gas reaction majorly.
*Now uses beepskysmash instead of pacid.
2015-01-07 03:30:54 +11:00
Sawu
9a20d1cb09 Adds the new "E.X.P.E.R.I-MENTOR" research machine, an alternate research option.
*Built with 1 scanning module, 2 manipulators and 2 micro lasers.
*Manipulators affect the reset speed, lasers affect it's chance to have bad things happen.
*Heavily RNG based to be the "fun" alternative.
*Includes features such as causing spacial distortions, transforming things into other things, and setting your face on fire.
*Can be built, but currently not included on the map.

The process of the EXPERI-MENTOR works as such:
1. Build it/walk up to it and click the "Scan for R&D Console" button if it is there.
2. Insert anything, literally anything.
3. The user uses a process of elimination to guess what the correct use for the item is ("Poke", "Irradiate", "Gas", "Heat", "Cold" or "Obliterate")
4. A correct guess results in addition of research points and (potentially) a randomised thing happening (reduced with upgrades). A failed results in a fluff message.

Current "use" RND events are:
Poke
*Destroy item, hit mobs in oview(1) for 15 brute
*Destroy item, proceeding to Obliterate
*Eject the item, throwing it at a random target in oview(7)
Irradiate
*Destroy item, apply 25 IRRADIATE to oview(1)
*In oview(1), spawn goo in oview(1)
*Transform item into something from valid_items list and eject it (primes grenades first)
Gas
*Destroy item, spawn toxic gas cloud
*Spawn harmless gas cloud
*Destroy item, Empulse(8,10)
Heat
*Destroy item, explosion(-1,0,0,0,0,flame_range = 2) (sets a small fire)
*Destroy item, heat up turf
*Eject item, spawn smoke, hit mobs for 5 burn in oview(1)
Cold
*Destroy item, release frostoil smoke
*Destroy item, cool down turf
*Eject item, spawn smoke
Obliterate
(by default, this will transfer m_amount and g_amount to a linked lathe)
(I'm aware that both of these are kind of "one item at a time", but I like the effect and left it that way)
*Destroy item, pull all mobs and items in oview(7) towards src
*Destroy item, throw all mob and items in oview(7) at other mobs and items
2015-01-05 04:53:51 +11:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
Menshin
a3f2d06b0b Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe. 2014-12-29 20:46:01 +01:00
Swag McYolosteinen
4205b8d531 Merge pull request #6620 from Menshin/missed_designs
Fixes missing designs for the protolathe construction
2014-12-27 20:35:08 +01:00
Menshin
9d430e1470 Done some missed designs for the R&D revamp. 2014-12-27 16:49:11 +01:00
tkdrg
a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
Menshin
cf41dab26f Conflict fixing 2014-12-25 22:34:40 +01:00
paprka
7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
paprka
47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
Cuboos
0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt
2014-12-15 18:12:14 -08:00
paprka
303564638b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	code/game/jobs/job/security.dm
2014-12-13 22:58:22 -08:00
Menshin
04fda27969 * Updated the autolathe to use the datum/designs system (new file
autolathe_designs.dm)
* Added categories sub-menus for the autolathe, circuit_printer and
protolathe
2014-12-13 22:56:43 +01:00
Hornygranny
98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
Conflicts:
	code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
Cheridan
3ede77face Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
paprka
dc01a092af Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
Razharas
f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening
Guns: the gunnening
2014-12-11 10:46:34 +03:00
paprka
6e2fc37ccd adds advanced taser 2014-12-10 01:07:33 -08:00
Cuboos
8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
paprka
f917bd2906 fixed some double periods 2014-12-08 19:13:44 -08:00
paprka
b01e6ba882 Generic names and buffs 2014-12-08 16:49:48 -08:00
Razharas
7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Menshin
ba44b325d3 Finished the exofab revamp:
* designs are now using the construction time var and the hacky /obj/item/mechavars is gone
* designs updated : there shouldn't be "no material" designs anymore
* cleaned the objects of their construction_cost and construction_time vars
* fixes the material name being displayed with $ character before
* this also fixes the overlay animation in inserting sheets
* the category var is now a list, so parts can be build/used with several chassis (fixes the Firefighter Chassis appearing when building Ripley)
* properly fix the href vulnerability when emptying (you can now remove all sheets of a materiel at once)
* the exofab now won't create a material sheet if there's not enough material (e.g 1000 metal)
* the exofab now won't accept a sheet if it would overstuff it (losing some material in the process)
* cleaned the code a bit (simplified, streamlined, using global vars, etc)

Finish #5722 and fixes #5954.
2014-12-02 23:00:22 +01:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-11-29 09:37:40 +02:00
Hornygranny
678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
Razharas
ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
Aranclanos
02d18de52a Fixes phazon chassis availability in the mech fabricator, they were missing. 2014-11-14 14:45:38 -03:00
hornygranny
d4a5d2ba1f Merge pull request #5786 from Miauw62/runtime1
Fixes some RD console runtimes.
2014-11-10 08:43:10 -08:00
Aranclanos
9b89f9160d Adds mechfabricator_designs.dm, a file with all the default designs for the exosuit fabricator.
Updates the .dme file to add the new file.
2014-11-09 11:41:24 -03:00
Miauw
28605093e2 Fixes some RD console runtimes. Fixed #5783 2014-11-09 13:59:25 +01:00
Aranclanos
d56698f991 Exosuit fabricator revamp
Exosuits will now use the designs from RnD to create objects instead of having the object already created on their contents.
Each one of the default items to build are now designs.
Removed access required to use the exosuit fabricators.
Removed an unused mech syringe gun design and replaced with a new one, with no cost.
Added a temporal object, /obj/item/mechavars, to be able to use initalize() for the construction time. This will be later on removed and the construction time will be ported to the design datums.
Some minors issues are still present, due to the amount of files needed to fix these, it won't be part of this commit, but a future one.
Fixes issue #3893
Removed required access to access the setting controls of the RnD console.
2014-11-06 23:45:16 -03:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-11-03 17:57:40 -08:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
tkdrg
d3727e6e3e Removes unused code instead of commenting it out 2014-11-03 18:25:05 -03:00
tkdrg
a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
2014-11-02 14:10:03 -03:00
tkdrg
30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl
Conflicts:
	code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
paprka
df289b5c53 Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-31 10:28:57 -07:00
paprka
389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
Swag McYolosteinen
4e7cb0eb01 Merge pull request #5530 from MrStonedOne/fukkinreallyerro
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
MrStonedOne
afbeb03d9f Fixes admin only vv related sql injection exploit in feedback reporting.
Noticed this while looking over my PR, by storing (and trusting) the escaped version, an admin could edit this in vv and do unspeakable things to the database
2014-10-29 18:19:47 -07:00
MrStonedOne
40d884dbfa Feedback reporting now uses 1 insert query with mutiple rows
Rather then making a new query for each feedback item.
Each query can take between 25ms and 100ms, and this is a static per-query overhead, so removing the 60 or so needless querys will speed things up.
2014-10-29 04:22:35 -07:00