2afd0f7862
adds key spawning and stuff
2015-01-21 18:39:17 -08:00
d874ca7f5f
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
2015-01-21 18:28:52 -08:00
08f8bb3ce8
replaces all instances of pacid with facid
2015-01-21 20:17:23 -06:00
3733c4ff48
Merge pull request #7230 from paprka/painigga
...
Adds walterje's pais
2015-01-21 19:51:19 -06:00
0f6122ce0e
remove copypaste
2015-01-21 16:55:38 -08:00
13070880cb
adds IV drips
2015-01-21 16:00:57 -08:00
8e288e367c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
code/game/objects/items/weapons/storage/firstaid.dm
2015-01-21 15:19:32 -08:00
39d5fa01d8
update, gauze, etc
2015-01-21 15:06:21 -08:00
a5c1faafb6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1
2015-01-22 03:24:54 +08:00
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
a93a1dfe36
usr -> user in monkey dexterity.
2015-01-21 19:57:48 +02:00
e5d04ba418
SecSprites2015
2015-01-21 23:07:15 +08:00
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
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
a811bba285
adds fanny packs and dufflebags to various lockers
2015-01-21 02:17:22 -05:00
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
e78e3e5118
adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots.
2015-01-20 23:16:21 -06:00
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
045b564cdf
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
...
Conflicts:
code/game/objects/structures/janicart.dm
2015-01-20 20:50:01 -08:00
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
793243763d
Merge pull request #7185 from paprka/inhandrefactor
...
Inhand refactor
2015-01-20 22:16:06 -06:00
1cdd5f011f
blood for the blood god
2015-01-20 19:17:59 -08:00
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
d97e01e0db
Merge pull request #7120 from Menshin/clusterbangs_fix
...
Made clusterbangs functionals
2015-01-20 21:00:52 -03:00
25a54a7466
adds walterje's pais
2015-01-20 14:31:17 -08:00
f4ed29551b
Merge pull request #7204 from Deantwo/NoCommentPDA
...
Blank PDA Messages Fix
2015-01-20 21:21:18 +01:00
e979bc95b1
Merge pull request #7150 from paprka/shoulderholster
...
Adds shoulder holster for the detective
2015-01-20 17:59:25 +01:00
48d032bd88
Merge pull request #7146 from paprka/wcoatr
...
Tones down winter coat spawning, removes santa hat spawns
2015-01-20 17:57:24 +01:00
63cb7dad4a
Merge pull request #7145 from paprka/gunsicons
...
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
ad04ce62a0
AllAccess+EasierSuitIdentification
2015-01-20 20:53:13 +08:00
a9160e52dc
Merge pull request #7105 from Carn/#6993
...
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-19 20:17:14 -03:00
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
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
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
2706be1190
optimizations to the way inhand files are found
2015-01-18 21:14:47 -08: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
bff20264da
Fixes ppgrass ausbush having wrong icon_state
2015-01-18 17:25:14 -03: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
b5ecc03b07
improves the sprites and code a bit
2015-01-18 00:26:36 -08: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
paprka
pudl
Nienhaus
Steelpoint
tkdrg
Firecage
Jordie0608
dannno
drynwyn
Cheridan
phil235
Swag McYolosteinen
Deantwo
Remie Richards
Menshin
carnie
Iamgoofball