Cheridan
8dfaed5fe4
Merge pull request #6871 from fleure/syndiebux
...
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
Cheridan
3d9cf1dc81
Merge pull request #7242 from drynwyn/PAYDAY
...
Payday Guns Bundle (Adds gloves, clown mask, suit to the guns syndicate bundle)
2015-01-23 21:52:46 -06:00
Cheridan
1428a5a16d
Merge pull request #7290 from Iamgoofball/goonchem_shoehorn_backup
...
Fixes the font issues, removes 3 mutations R.I.P
2015-01-23 21:39:42 -06:00
tkdrg
cb55d4533d
Merge pull request #7179 from Firecage/Violin_hit
...
Adds sound effect to hitting with violin.
2015-01-23 22:15:13 -03:00
Swag McYolosteinen
6094240b5a
Merge pull request #7246 from dannno/dufflebags
...
Fannypacks and Dufflebags
2015-01-23 20:06:26 +01:00
Swag McYolosteinen
5e55d4e096
Merge pull request #7141 from Firecage/floor_tile_fix
...
A fix so mineral floor tiles can be reshaped into mineral sheets.
2015-01-23 17:53:49 +01:00
Swag McYolosteinen
fdb0fd330c
Merge pull request #7102 from tkdrg/thxobama
...
Fixes mining borg jetpack
2015-01-23 17:46:40 +01:00
Swag McYolosteinen
10ea66cb6b
Merge pull request #7164 from Steelpoint/ERTBalanceV1
...
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
2015-01-23 17:16:33 +01:00
dannno
9fd1c313d0
resolve conflicts
2015-01-23 01:36:58 -05:00
tkdrg
7df272f3d6
Merge pull request #7128 from Jordie0608/timeforanewnew()
...
Reagent container spawning refactor
2015-01-23 02:38:42 -03:00
tkdrg
abc78fbba1
Merge pull request #7177 from Menshin/disposals_cleaning_part2
...
Disposals cleaning/fixing part 2
2015-01-23 02:26:30 -03:00
dannno
28bff00e6a
removes 2 syndie bags, removes slowdown from syndie bags
2015-01-22 23:49:14 -05:00
Jordie0608
26161659c5
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/reagents/reagent_containers/bottle.dm
2015-01-23 14:11:38 +11:00
Iamgoofball
de12010e31
Fixes the font issues, removes 3 mutations R.I.P
2015-01-22 17:28:13 -08:00
hornygranny
22e96d3377
Merge pull request #7277 from pudl/chemfix
...
replaces all instances of pacid with facid
2015-01-22 17:06:46 -08:00
Steelpoint
d82736a3c3
MoreRefinment
2015-01-23 02:19:17 +08:00
Steelpoint
0a82231f0c
AccessRefinement
2015-01-23 01:54:20 +08:00
Swag McYolosteinen
b44956df86
Merge pull request #7191 from paprka/ebowfix
...
fixes ebow and KA breaking once emp'd
2015-01-22 18:04:08 +01:00
Jordie0608
f535abcc06
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/food&drinks/food/snacks_burgers.dm
code/modules/food&drinks/food/snacks_cake.dm
code/modules/food&drinks/food/snacks_pastry.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-01-22 15:15:17 +11:00
pudl
08f8bb3ce8
replaces all instances of pacid with facid
2015-01-21 20:17:23 -06:00
Nienhaus
3733c4ff48
Merge pull request #7230 from paprka/painigga
...
Adds walterje's pais
2015-01-21 19:51:19 -06:00
Steelpoint
a5c1faafb6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1
2015-01-22 03:24:54 +08:00
tkdrg
11f3717771
Merge pull request #7162 from Firecage/monkey_dexterity_message
...
Gives the monkey dexterity message to some stuff.
2015-01-21 15:35:29 -03:00
Firecage
a93a1dfe36
usr -> user in monkey dexterity.
2015-01-21 19:57:48 +02:00
Jordie0608
6140a61de7
Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
...
Conflicts:
code/modules/food&drinks/food/snacks_pastry.dm
2015-01-21 20:25:45 +11:00
tkdrg
13a7d6d61b
Merge pull request #7173 from Carn/#6971
...
Resolves #6971 - non-lighting_subarea areas are now stored in list/sorte...
2015-01-21 05:06:25 -03:00
dannno
a811bba285
adds fanny packs and dufflebags to various lockers
2015-01-21 02:17:22 -05:00
Jordie0608
4a82ff1564
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/pill.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
pudl
e78e3e5118
adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots.
2015-01-20 23:16:21 -06:00
drynwyn
19ec40fce8
Update uplink_kits.dm
...
Adds nitrile gloves, clown mask, and a suit to the Guns bundle
2015-01-21 00:04:59 -05:00
pudl
dd5c7db5ad
in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
...
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin
the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.
medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box
this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.
gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.
medkits now have some new equipment.
normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer
fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill
toxin is unchanged
oxygen
4x salbu pills
2x epipen
1x health analyzer
all maps and z levels are updated for this.
renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle
adds myself to admins.txt
2015-01-20 22:26:13 -06:00
Cheridan
793243763d
Merge pull request #7185 from paprka/inhandrefactor
...
Inhand refactor
2015-01-20 22:16:06 -06:00
Cheridan
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
tkdrg
d97e01e0db
Merge pull request #7120 from Menshin/clusterbangs_fix
...
Made clusterbangs functionals
2015-01-20 21:00:52 -03:00
paprka
25a54a7466
adds walterje's pais
2015-01-20 14:31:17 -08:00
phil235
f4ed29551b
Merge pull request #7204 from Deantwo/NoCommentPDA
...
Blank PDA Messages Fix
2015-01-20 21:21:18 +01:00
Swag McYolosteinen
e979bc95b1
Merge pull request #7150 from paprka/shoulderholster
...
Adds shoulder holster for the detective
2015-01-20 17:59:25 +01:00
Swag McYolosteinen
63cb7dad4a
Merge pull request #7145 from paprka/gunsicons
...
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
Steelpoint
ad04ce62a0
AllAccess+EasierSuitIdentification
2015-01-20 20:53:13 +08:00
tkdrg
a9160e52dc
Merge pull request #7105 from Carn/#6993
...
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-19 20:17:14 -03:00
Deantwo
2a78daa8b5
Blank PDA Messages Fix
...
- Added "if (!t) return" after msg_input is called. So no blank
messages.
2015-01-19 20:10:21 +01:00
Remie Richards
96ac837b65
Merge pull request #6960 from Iamgoofball/goonetics
...
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
paprka
82692cd6e0
fixes the kinetic accellerator dying
2015-01-19 01:29:52 -08:00
paprka
2566cf030e
fixes ebow and KA breaking once emp'd
2015-01-19 01:28:14 -08:00
Jordie0608
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
paprka
f58096575c
refactors guns
2015-01-18 23:28:24 -08:00
Jordie0608
a643ecdfcc
Food and drinks refactor
2015-01-19 18:06:15 +11:00
paprka
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
Firecage
6d688565b4
Adds sound effect to hitting with violin.
2015-01-19 03:20:51 +02:00
Menshin
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
