Commit Graph

6995 Commits

Author SHA1 Message Date
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
hornygranny
7f4dbcfa15 Merge pull request #6493 from MrPerson/feature_removal_2
Removes the heat up donk pocket recipe
2014-12-22 12:22:13 -08:00
MrPerson
4622ecf3d3 Removes the sugar from donk pockets
Further cleanup of them
2014-12-22 11:50:22 -08:00
hornygranny
28a23f7dae Merge pull request #6506 from Menshin/silicons_motion_alarms_fix
Fixes AI motion alarms not properly clearing
2014-12-22 10:47:18 -08:00
hornygranny
4acb27da43 Merge pull request #6500 from Menshin/guns_related_bugfixing
Guns related bugfixes
2014-12-22 10:46:30 -08:00
MrPerson
c002d11ee7 Merge pull request #6476 from Cheridan/nightcrawler
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
Menshin
4a142a0a6b * Motions alarms will now properly clear for AI (and silicons)
* Some code cleaning
2014-12-21 13:29:51 +01:00
Menshin
20c640ae38 Added some defines for better clarity 2014-12-21 02:10:01 +01:00
Menshin
05378c014d * fixes #3765 (shotguns sawing off)
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
2014-12-21 01:35:49 +01:00
MrPerson
74e8598fe0 Removes the heat up donk pocket recipe
I could cap tricord in the new pocket but frankly this recipe is dumb anyway

Fixes #6437
Also stops the duplication of donk pockets, which is a shame but oh well.
2014-12-20 06:39:06 -08:00
hornygranny
579f297076 Merge pull request #6444 from tkdrg/shardopplsnerf
Tweaks the Supermatter a bit
2014-12-19 14:57:22 -08:00
tkdrg
d7e05d4387 Adds Supermatter logging and tweaks the power gen
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00
hornygranny
166778d43e Merge pull request #6459 from MrPerson/ninja_rewrite
Removes a bunch of commented out code from ninja.dm
2014-12-19 10:48:51 -08:00
hornygranny
0600ad6948 Merge pull request #6462 from phil235/BearTrapRemovalFailMsg
Fixes handcuff/legcuff/beartrap removal fail message
2014-12-19 10:47:41 -08:00
paprka
f1963ce537 Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
tkdrg
f1101f77a9 Adds 3 more scarves
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
Cheridan
fdab1d7294 REMOVES THE BLACKS 2014-12-18 21:16:29 -06:00
Cheridan
25cc2999b0 Refactors snowflake AI hosting in ninja
why did i volunteer for this

It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.

the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06:00
tkdrg
d44fa004b0 Merge branch 'master' into scarfs
Conflicts:
	icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
tkdrg
eaec9a6e1b 9 more scarves and small corgi cleanup
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
phil235
ca3df3b4a1 Fixes handcuff/legcuff/beartrap removal fail message appearing many seconds after the actual fail. It will now appear twice as fast.
Replacing two usr.
Fixing being able to remove both handcuff and legcuff by resisting once.
2014-12-18 17:42:42 +01:00
MrPerson
81591498ca Removes a bunch of commented out code from ninja.dm 2014-12-18 07:29:16 -08:00
Cheridan
566066a73a Merge pull request #6441 from paprka/corpsecthecorpening
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
paprka
9d46ccceac old warden jacket for the lockers 2014-12-17 23:01:10 -08:00
paprka
0976cde773 updates ian so he can use civillian armor instead of sec armor 2014-12-17 18:13:24 -08:00
tkdrg
62b99c7007 Adds scarfs
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
Cheridan
62252f0273 Merge pull request #6420 from phil235/TypoFix2
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
tkdrg
c0fb78edd5 Tweaks the Supermatter a bit
Reduces the amount of heat and power released. Removes redundant code.
2014-12-17 16:06:33 -03:00
hornygranny
5a26db0285 Merge pull request #6401 from Menshin/solars_runtime_fix
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
paprka
a6e12c2ea9 warden bug, warden belt, backpacks 2014-12-17 09:19:04 -08:00
paprka
4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
Razharas
82654b579a Merge pull request #6395 from Steelpoint/master
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
paprka
f0d80d487d adds EMT caps 2014-12-16 21:04:27 -08:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Remie Richards
c021bda843 Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
Menshin
672b476f23 Tidying a little 2014-12-16 13:16:19 +01:00
Steelpoint
fb5eeb4265 HoP/BartenderArmor 2014-12-16 15:35:49 +08:00
Steelpoint
d4c2cc3b64 MapChanges/ArmourSpriteChanges 2014-12-16 11:48:06 +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
hornygranny
4ceaa597ab Merge pull request #6385 from phil235/UsedSlimecoreFridgeFix
Fixes not being able to remove used slime extract from smartfridge
2014-12-15 16:28:39 -08:00
hornygranny
5dd86ab53d Merge pull request #6370 from Xhuis/monkeying_around
Fixes monkeys being able to read books
2014-12-15 16:27:51 -08:00
hornygranny
a9e3edbffe Merge pull request #6359 from phil235/SlimeAttackSlimePeopleFIx
Fixes Slimes attacking slime people.
2014-12-15 16:26:26 -08:00
hornygranny
f96f222c18 Merge pull request #6358 from tkdrg/demplatings
Fixes being able to turn asteroid into normal turf
2014-12-15 16:25:45 -08:00
Menshin
51e10e6a19 Fixes controless tracker runtime 2014-12-16 01:23:29 +01:00
hornygranny
1519e320ee Merge pull request #6357 from tkdrg/funtimes
Fixes two runtimes
2014-12-15 10:05:38 -08:00