tkdrg
d3975845b9
Merge pull request #6688 from phil235/LibraryComputer
...
Library console are now real buildable computers
2015-01-15 00:46:24 -03:00
tkdrg
4a6df00494
Adds chemical heater nanoUI & construction/upgrade
...
Also buffs the heater to heat/cool 10 kelvin per tick per upgrade level.
Fixes #7040
Fixes #7060
2015-01-14 22:41:53 -03:00
Firecage
e4e5c1ae62
This adds a delay to anchoring and unanchoring a hydroponics tray.
2015-01-15 02:45:51 +02:00
phil235
502495a47d
simplifying the code a bit.
2015-01-15 01:06:33 +01:00
phil235
9e8531448a
Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name.
...
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.
The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
2015-01-15 00:56:50 +01:00
Iamgoofball
fe73421b25
Fixes #7059
2015-01-14 15:52:53 -08:00
tkdrg
64ce7ea958
Advanced ProcCall improvements & Atom ProcCall
...
You can now right click an atom to call a proc on it if you have +DEBUG.
Also cleaned up callproc() code a bit.
2015-01-14 18:47:05 -03:00
Lo6a4evskiy
d838af77ec
Fix mixer
2015-01-15 01:22:35 +04:00
Menshin
416c71b99e
* Non-leaping thrown aliens are now behaving like other mobs
...
* Removed a useless check
2015-01-14 20:32:51 +01:00
Remie Richards
17654037db
Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat.
2015-01-14 19:07:18 +00:00
phil235
778a10688d
Fixes feeding messages that was showing the attacker's message to the victim.
2015-01-14 19:57:39 +01:00
tkdrg
674b3b65c0
Merge pull request #6968 from phil235/LockdownMalfFix
...
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03:00
phil235
884e2a6f73
Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.
2015-01-14 18:00:17 +01:00
phil235
bd189431d0
Merge pull request #7002 from Menshin/gunlights_runtimes_fix
...
Fixes "Toggle Gunlight" verb runtimes
2015-01-14 17:29:15 +01:00
phil235
f93ee8b99b
Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.
2015-01-14 14:04:21 +01:00
MrPerson
85b277c404
Merge pull request #7011 from Firecage/Blubbery_be_gone
...
This fixes that "You suddenly feel blubbery" message spam.
2015-01-14 02:12:28 -08:00
Sawu
0de72483bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-14 18:35:29 +11:00
tkdrg
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
Iamgoofball
fecaa06cff
removes getTotalLoss() for REAL THIS TIME
2015-01-13 21:02:37 -08:00
Iamgoofball
57ad61f75f
removes scrollbar from chemdispenser nanoui menu due to new chems
2015-01-13 20:56:39 -08:00
Iamgoofball
a70cfc4c86
fixes medipens even more
2015-01-13 20:49:54 -08:00
Iamgoofball
e8217f7eae
fixes medipens more
2015-01-13 20:46:38 -08:00
Iamgoofball
b80723265d
Adds an extra chemical, tweaks, fixes, changes to be more accurate to Goonchem.
2015-01-13 20:24:11 -08:00
paprka
2fd8b3e749
nerfed saber slightly
2015-01-13 20:05:37 -08:00
paprka
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
Iamgoofball
8e9c008030
forgot to end a span class
2015-01-13 19:08:07 -08:00
Iamgoofball
8b39dec424
span classes
2015-01-13 19:06:41 -08:00
tkdrg
d10364797a
Merge pull request #6981 from dannno/bandanno's
...
Bandanas/More jumpsuits in mixed fixed
2015-01-13 21:49:47 -03:00
dannno
4bc4d44ab7
action button and headmaskform removes, terrorists win
2015-01-13 17:30:42 -05:00
dannno
555afcfb58
tkdrg's generalization suggestion no more snowflake
2015-01-13 17:16:41 -05:00
dannno
5dc6f1449f
when in hat form, bandanas can be added to head slot
...
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
Swag McYolosteinen
430b613ef4
Merge pull request #6984 from tkdrg/sanitaiz
...
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
Firecage
4ee6fb9157
This fixes that "You suddenly feel blubbery" message spam.
2015-01-13 11:53:23 +02:00
Sawu
4a24c06d87
QuickChange
...
* Added a debug verb to test reactions.
2015-01-13 20:00:55 +11:00
Cheridan
7f46070abf
Update pins.dm
...
-name change for muh fluff
-i am in paprika's pocket
2015-01-13 02:57:08 -06:00
paprka
3ce1bf233f
fixes some compile errors with my previous PR
2015-01-13 00:45:58 -08:00
Cheridan
1c090e02b7
Merge pull request #6787 from paprka/serviceandsupply
...
Separates supply from civilian (service) jobs
2015-01-13 02:19:30 -06:00
Cheridan
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Cheridan
857944a6d2
Merge pull request #6959 from tkdrg/fuckingHELL
...
Fixes basic med hud regression bug
2015-01-13 01:59:21 -06:00
Sawu
f717703a10
Quickfix
...
* Fixes coffee event vending machines instead of coffee
* Fixes coffee containing frostoil instead of capsaicin.
2015-01-13 18:47:56 +11:00
Cheridan
4cf4779596
Merge pull request #6643 from phil235/HungerNerf
...
Sugar nerf
2015-01-13 01:47:37 -06:00
Steelpoint
1a0cc48566
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/obj/gun.dmi
2015-01-13 15:32:28 +08:00
Cheridan
4bd70b2908
Merge pull request #6986 from Menshin/ear_damage_ooping
...
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
Cheridan
4141a34a4f
Merge pull request #6956 from Carn/#3554
...
Resolves #3554 - spacevines will now spread on shuttle turfs.
2015-01-13 00:58:42 -06:00
Incoming
6f0a50381c
Adds an antag hud system for wizards.
...
The huds won't be activated when there's just one wizard, but when another magic user is brought in the huds will appear for both of them to allow for easy identification in the face of rampant mindswaps and/or identity shinanagans and/or getting turned into a cow by a staff of change.
The huds are on by default in ragin' mages.
2015-01-13 00:14:05 -05:00
Iamgoofball
470ef28c11
Adds a changelog and reduces drug text spam.
2015-01-12 21:12:38 -08:00
lolnon
96931efa9c
Changes Oddysseus chemical synth to be dependent on can_synth instead of the arbitrary reagent_state value.
2015-01-13 05:00:15 +00:00
Steelpoint
64ba51c0b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
2015-01-13 12:52:24 +08:00
Iamgoofball
5a91ce4fee
Requested changes by @Cheridan
2015-01-12 20:38:56 -08:00