04aea90f86
* Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)
...
* A typo fixed
2015-02-13 22:33:58 +01:00
50576c367f
Adds NVG Mesons
...
- Adds Night Vision Optical Mesons Scanners to RnD.
2015-02-13 12:23:07 -06:00
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
0b0737b292
Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos
...
Conflicts:
icons/mob/belt.dmi
icons/obj/guns/energy.dmi
2015-02-12 09:08:31 -06:00
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
8ec97cdaa1
Merge pull request #7632 from GunHog/ExperimentorChanges
...
E.X.P.E.R.I-MENTOR changes
2015-02-11 08:18:57 -06:00
5786626c87
Introducing the Ion Carbine!
...
- Adds the Ion Carbine, a compact version of the Ion Rifle that users
can carry on their belt or in a regular backpack.
- Adds the Ion Carbine to R&D, replacing the Ion Rifle.
- Ion Rifle now starts with a pin installed as it can no longer be made
in Science.
- The Ion Rifle and Ion Carbine can now accept Seclites as an
attachment.
2015-02-10 18:03:30 -06:00
9cad9c6745
E.X.P.E.R.I-MENTOR changes
...
Meteor storm event replaced with fireballs.
EMP range reduced.
Bit of flavor stuff added to the 'coffee' reaction results.
Self-duplicating relic nerf to a max of 10 copies of itself, down from
45.
2015-02-09 16:16:58 -06:00
d9cf21effe
Merge pull request #7586 from Menshin/r&d_console_search
...
Added a search function to fabricators menus
2015-02-09 19:19:25 +01:00
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
049733d319
Merge pull request #7567 from GunHog/EjectFix
...
E.X.P.E.R.I-MENTOR fixes
2015-02-08 21:13:52 +01:00
3ef71865f1
Added a search function to the R&D Console protolathe and imprinter menus
2015-02-07 01:57:46 +01:00
92f5bc2dc8
MergeConflict
2015-02-06 13:21:23 +08:00
b70e95d858
Deconstruction fix
...
When deconstructed, the Experimentor will now spit out any item it
contains, should it have one.
2015-02-05 16:23:59 -06:00
44888bdcfb
INCREASES SANITY!!
...
- Fixes a bug in which ejected items are sent to a null turf.
- Added a sanity check when the machine tries to throw a null object.
- Relic discovery works again!
2015-02-05 16:07:21 -06:00
f1329e5794
Fixes ejection issue with the E.X.P.E.R.I-MENTOR
...
Fixes an issue in which manually ejecting an item from the
E.X.P.E.R.I-MENTOR caused it to become inoperable.
2015-02-05 12:47:47 -06:00
26873cd973
changes combat requirement to materials
2015-02-04 13:12:43 -08:00
b7994d7c2d
research and different mat requirements for borg upgrades
2015-02-04 13:01:05 -08:00
be26c22e74
Merge pull request #7320 from GunHog/IFixedItForSCIENCE
...
Fixes the E.X.P.E.R.I-MENTOR and related reagent runtime
2015-01-26 19:30:29 +01:00
0a3ffd8f19
Complete fix for reagent runtimes
...
The proc was simply used incorrectly. Replaces "=" with ","
2015-01-26 12:25:20 -06:00
25c23db4c8
nanomachines, son
2015-01-24 18:52:33 -08:00
8a28571d83
fixes more runtimes
2015-01-24 18:31:59 -08:00
d886d38cc6
Fixes more runtimes with the experimentor
2015-01-24 08:36:15 -08:00
279c2709d4
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-24 01:40:51 -08:00
b329516181
fixes some incorrect chemicals
2015-01-23 21:13:33 -08:00
40fe50d8e9
Fixes the E.X.P.E.R.I-MENTOR
...
The "FAIL" define was set equal to the "SCANTYPE_DISCOVER" define,
resulting in the machine thinking everything was a relic and calling a
nonexistant reveal() proc on it.
2015-01-23 22:08:33 -06:00
709b6c8a33
Merge pull request #7278 from sawu-tg/expexpanded2
...
Changes/Fixes/Features to the Experimentor
2015-01-24 05:30:19 +03:00
ec31f83813
Fixes a missed span
2015-01-24 05:32:51 +11:00
72af5ffb8f
Did what HG said to do with Protosmg firing pin
2015-01-22 08:08:14 +02:00
6e1a292328
Fixed incorrect span
2015-01-22 15:30:35 +11:00
21edbc1f6f
Changes/Fixes/Features to the Experimentor
...
* Fixes #7224
* Re-fixes #7272
* Adds relics that spawn around the station, can be researched for randomised objects.
* Adds the meteor malfunction.
2015-01-22 14:01:02 +11:00
2afd0f7862
adds key spawning and stuff
2015-01-21 18:39:17 -08:00
93f0514017
Merge pull request #7199 from sawu-tg/expruntime
...
Fixes a runtime
2015-01-20 23:06:11 -06:00
5f185bf74b
Fixes a runtime
...
Fixes the experimentor throwing runtimes from mismatched types.
2015-01-20 04:27:42 +11:00
6798919be6
Merge pull request #7137 from tkdrg/heatertweak
...
Fixes heaters breaking chem dispenser research
2015-01-18 11:23:07 +01:00
bd8594dd20
Merge pull request #7116 from bear1ake/protolathe-fix
...
Adds "Firing pins" category to protolathe
2015-01-17 15:59:28 -06:00
3c2f10e401
Fixes heaters breaking chem dispenser research
2015-01-17 16:34:00 -03:00
3867079e51
Merge pull request #7068 from tkdrg/toast
...
Adds chemical heater nanoUI & construction/upgrade
2015-01-17 01:29:13 +00:00
87881ffb94
Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-17 09:55:12 +11:00
22c1889725
Adds "Firing pins" category to protolathe
2015-01-17 01:23:04 +09:00
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
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
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
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
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
4a24c06d87
QuickChange
...
* Added a debug verb to test reactions.
2015-01-13 20:00:55 +11:00
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
03e1d0d60a
-Adds firing pin box define
...
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
0002084b28
Fixes issues with the Transform result returning nothing but food.
...
* Adds a (shitty) weighted list proc
* Food has been weighted randomly, all other objects have 15 weight.
2015-01-13 02:28:46 +11:00
Menshin
GunHog
paprka
Cheridan
Swag McYolosteinen
Steelpoint
Iamgoofball
Razharas
Sawu
Firecage
tkdrg
Remie Richards
bear1ake
Cheridan
phil235