b83ca5f8d1
Goon Chemistry: Addiction and Overdosing
2015-01-18 21:50:54 -08:00
b031c23a9e
woop woop warning fix woop woop
2015-01-16 21:09:07 -08:00
3a397a9472
Merge pull request #7124 from Iamgoofball/goonchem_shoehorn_backup
...
Removes Star Trek chemicals, replaces them with Goon Chemistry
2015-01-17 01:32:38 -03:00
a93ffe46a6
changes and tweaks
2015-01-16 20:18:56 -08:00
80a3e119f4
removes incorrect sound effects
2015-01-16 19:32:34 -08:00
8b3cff9281
Forgot a ephedrine -> epinephrine
2015-01-16 19:29:25 -08: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
fec3b3e9dd
Changes, adjustments, NEW CHEMICAL: Epinephrine
2015-01-16 17:56:55 -08:00
3867079e51
Merge pull request #7068 from tkdrg/toast
...
Adds chemical heater nanoUI & construction/upgrade
2015-01-17 01:29:13 +00: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
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
e0df8b1a00
Merge pull request #7048 from phil235/FeedMessageFix
...
Fixes feeding messages that was showing the attacker's message to the victim.
2015-01-16 15:10:39 -03:00
2ed26720d4
Merge pull request #7082 from paprka/varincrease
...
Further adjusts dirt on tiles
2015-01-16 17:00:55 +01:00
0ebd227f71
Merge pull request #7034 from paprka/nosenseofrightandwrongiguess
...
Crossbow, speargun, and grenade updates
2015-01-16 16:43:50 +01:00
f5ab9bad47
Merge pull request #7051 from Menshin/dead_ahunter_leaping_fix
...
Made non-leaping thrown aliens impact like normal mobs
2015-01-16 16:32:47 +01:00
c543fdf100
Merge pull request #7063 from Iamgoofball/goonchem_map
...
Fixes #7059
2015-01-16 16:26:57 +01:00
3594c96aca
Merge pull request #7090 from Firecage/HONKER_mousetrap_mortor
...
Fixes the issue of mousetrap mortars firing unarmed mousetraps.
2015-01-16 14:22:30 +01:00
102c240039
Merge pull request #7066 from Firecage/hydro_tray_wrenching_time
...
Adds a delay to anchoring/unanchoring a hydroponics tray. Fixes #6466
2015-01-16 14:18:26 +01:00
018b7379b4
Merge pull request #7088 from Firecage/tele_window_knocking_delay
...
Simply adds a delay to knocking in windows with TK.
2015-01-16 13:59:39 +01:00
c15c008524
Merge pull request #7089 from Firecage/space_clown_b_gone
...
Stops clown shoes from squeaking in zero grav, and thus space. Fixes #6568
2015-01-16 13:39:42 +01:00
204fdb8b2f
Update to biogenerator stuff PR
2015-01-16 09:24:39 +02:00
4a0aa0c0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/ammunition/ammo_casings.dm
code/modules/projectiles/ammunition/boxes.dm
icons/obj/ammo.dmi
icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
6bfebf2e48
Adds bolt-action rifle
...
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151
These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.
The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03: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
51a42968f0
Merge pull request #6886 from hornygranny/soulshardboogaloo
...
only wizards and cultists can use soul shards
2015-01-15 23:11:11 -06:00
b721fd72de
Merge pull request #5902 from Razharas/NewShit
...
Turbine fixing general
2015-01-15 22:43:28 -03:00
d30872024c
And other readibility improvement
2015-01-16 04:31:02 +03:00
f393be45b6
Tiny readibility improvement
2015-01-16 04:08:07 +03:00
ea4b5b2872
Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned
2015-01-15 16:17:51 -06:00
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
5176efb88b
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewShit
...
Conflicts:
code/game/machinery/Freezer.dm
Fixing conflicts
2015-01-16 00:24:53 +03: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
5b406907ce
Merge pull request #7018 from Firecage/Crew_manifest_jobs
...
This adds some jobs properly to the crew monitoring console.
2015-01-15 19:17:08 +01:00
fa20eaae54
Merge pull request #7026 from optimumtact/runeytunes
...
Change is_muzzled check to a can_speak check instead
2015-01-15 19:15:42 +01:00
2082baa64b
Merge pull request #7042 from phil235/AudibleMessageRuntimeFix
...
Fixes some runtimes from audible_message proc.
2015-01-15 19:14:31 +01:00
ac818980b2
Merge pull request #7045 from Menshin/onCentcom_fix
...
onCentcom check fix
2015-01-15 19:13:43 +01:00
66d47e0e5a
Merge pull request #7032 from Iamgoofball/raginmages
...
Fixes Rapid Mitosis Blob
2015-01-15 14:28:47 -03:00
3617640a64
Merge pull request #6595 from tkdrg/guncargo
...
Fixes cargo investigate log spam
2015-01-15 13:06:36 +01:00
b67aaffc86
Makes the mousetrap mortar fire armed mousetraps.
2015-01-15 13:38:41 +02:00
baac32890b
Stops clown shoes from squeeking in space and zero grav.
2015-01-15 13:18:01 +02:00
f40d799e34
Simply adds a delay to knocking in windows with TK.
2015-01-15 11:49:38 +02: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
2aa837f8f4
Wrench/unwrench messages only one for hydro trays
2015-01-15 09:27:03 +02:00
Iamgoofball
tkdrg
Remie Richards
Sawu
JJRcop
Swag McYolosteinen
phil235
Firecage
paprka
Cheridan
Razharas
Cheridan