82692cd6e0
fixes the kinetic accellerator dying
2015-01-19 01:29:52 -08:00
2566cf030e
fixes ebow and KA breaking once emp'd
2015-01-19 01:28:14 -08:00
3bd637b186
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/reagents/reagent_containers/bottle.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/reagents/reagent_containers/patch.dm
code/modules/reagents/reagent_containers/pill.dm
2015-01-19 18:28:38 +11:00
f58096575c
refactors guns
2015-01-18 23:28:24 -08:00
a643ecdfcc
Food and drinks refactor
2015-01-19 18:06:15 +11:00
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
6d688565b4
Adds sound effect to hitting with violin.
2015-01-19 03:20:51 +02:00
b8230e024b
* Cleaned the disposals code a bit (making it uses the defines !)
...
* Disposals constructs are now stored inside disposals instead of having them deleted and a copy created
* Bins, chutes and outlets will now properly clean any connected trunk on qdel()
* You can no longer change the RPD setting by keeping its window opened
* You can no longer use the RPD as a non-dextrous mob
* Reinforced floors will now be broken by ejected items/mobs, instead of stucking them in the void indefinitely
2015-01-19 01:53:19 +01:00
f4c35d2a78
Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.
...
This allows you to jump to areas by name, rather than type.
2015-01-18 20:46:30 +00:00
3c69773a6c
changes usr to user and adds another check.
2015-01-18 19:34:51 +02:00
a097f86ac6
ERTBalancePassV1
2015-01-18 19:18:47 +08:00
950bc17c23
Gives the monkey dexterity message to some stuff.
2015-01-18 11:48:53 +02:00
b64efc6b54
Adds 3 new disabilities
2015-01-17 18:55:41 -08:00
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -08:00
1b6831dab1
splits gun.dmi up into multiple files
2015-01-17 15:34:30 -08:00
6e8fdc8b57
A fix so mineral floor tiles can be reshaped into mineral sheets.
2015-01-17 23:55:25 +02:00
059d8cf650
Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention
...
Some disposals cleaning/stacking fix
2015-01-17 17:16:52 -03:00
bc9d48fa42
Mutadone and Mannitol, tweaks and changes.
2015-01-16 19:28:13 -08:00
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
c08e4e4332
Merge pull request #7084 from JJRcop/ChronOPS
...
Adds Chronosuit and T.E.D
2015-01-17 01:02:52 +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
309f8ca1b0
Made clusterbangs functionals again.
...
General code cleanup.
2015-01-16 22:29:17 +01:00
ac3c413f24
Merge pull request #6969 from Firecage/Biogenerator_stuff
...
Adds stuff to Biogenerator. STUFF!.
2015-01-16 17:31:25 -03:00
8fecbe2318
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
...
Conflicts:
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/projectiles.dmi
2015-01-16 14:09:07 -05:00
eae84c1c39
further conflicts and bugfixes
2015-01-15 21:59:36 -08: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
63e09d0928
Merge pull request #6966 from Steelpoint/ERTv2
...
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
a44795a699
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-15 23:50:46 +00:00
548b19b5e3
Fixes mining borg jetpack
...
Credits to ririchiyo @ /vg/station for figuring this out.
2015-01-15 19:44:41 -03:00
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
8d1ebf3ad1
* Prevent stacking of dense disposal constructs (bin, outlet, chute)
...
* Some general code cleaning (less snowflaking)
2015-01-15 20:05:15 +01:00
31ebd43b18
Fixes issues with the chronosuit and TED.
...
Removes unneeded vars from TED.
Re-adjusts armor values for chronosuit
2015-01-15 13:32:21 -05:00
f34afaa3c9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
...
Conflicts:
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/projectiles.dmi
2015-01-15 02:30:31 -05:00
4c8f890f88
Adds Timeline Eradication Device
2015-01-15 02:18:04 -05:00
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
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
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
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
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
430b613ef4
Merge pull request #6984 from tkdrg/sanitaiz
...
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
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
4bd70b2908
Merge pull request #6986 from Menshin/ear_damage_ooping
...
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
64ba51c0b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
2015-01-13 12:52:24 +08:00
5a91ce4fee
Requested changes by @Cheridan
2015-01-12 20:38:56 -08:00
f8e1fac30c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-12 21:29:00 -06: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
paprka
Jordie0608
Firecage
Menshin
carnie
Steelpoint
Iamgoofball
tkdrg
Remie Richards
Sawu
JJRcop
Cheridan
Cheridan
phil235
Swag McYolosteinen