Remie Richards
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
Swag McYolosteinen
d26e40a6ee
Merge pull request #7282 from Firecage/SkinningMonkeysXenos
...
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
paprka
be925ebd62
adds a check for the buffer upgrade
2015-01-24 01:49:07 -08:00
paprka
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
Swag McYolosteinen
6094240b5a
Merge pull request #7246 from dannno/dufflebags
...
Fannypacks and Dufflebags
2015-01-23 20:06:26 +01:00
Steelpoint
217809bab6
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015
...
Conflicts:
icons/mob/uniform.dmi
2015-01-24 01:11:14 +08:00
Swag McYolosteinen
ac8d96af0b
Merge pull request #7171 from tkdrg/nicebush
...
Fixes ppgrass ausbush having wrong icon_state
2015-01-23 17:27:14 +01:00
dannno
9fd1c313d0
resolve conflicts
2015-01-23 01:36:58 -05:00
dannno
28e40fa2be
probability for dufflebag spawns in personal lockers.
2015-01-23 01:29:55 -05:00
dannno
28bff00e6a
removes 2 syndie bags, removes slowdown from syndie bags
2015-01-22 23:49:14 -05:00
Steelpoint
d82736a3c3
MoreRefinment
2015-01-23 02:19:17 +08:00
Firecage
3836f7a30a
Spike skinned == -> >=
2015-01-22 20:13:27 +02:00
Firecage
b621d94be8
#DEFINES for skinning spike
2015-01-22 19:42:42 +02:00
Firecage
2228b443a7
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-22 15:17:22 +02:00
Steelpoint
e63c805494
FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns
2015-01-22 16:47:01 +08:00
paprka
d874ca7f5f
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
2015-01-21 18:28:52 -08:00
paprka
0f6122ce0e
remove copypaste
2015-01-21 16:55:38 -08: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
Steelpoint
e5d04ba418
SecSprites2015
2015-01-21 23:07:15 +08:00
dannno
a811bba285
adds fanny packs and dufflebags to various lockers
2015-01-21 02:17:22 -05:00
paprka
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
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
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06: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
Steelpoint
ad04ce62a0
AllAccess+EasierSuitIdentification
2015-01-20 20:53:13 +08:00
tkdrg
bff20264da
Fixes ppgrass ausbush having wrong icon_state
2015-01-18 17:25:14 -03:00
Firecage
950bc17c23
Gives the monkey dexterity message to some stuff.
2015-01-18 11:48:53 +02:00
paprka
b5ecc03b07
improves the sprites and code a bit
2015-01-18 00:26:36 -08:00
paprka
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -08:00
paprka
ae21c54774
rip reindeer horns
2015-01-17 15:43:39 -08:00
paprka
b83e6d9da4
winter coat removals
2015-01-17 15:39:50 -08:00
phil235
8a61d11e2e
Merge pull request #7069 from Firecage/table_deconstruction_fix
...
Fixes amount of materials gotten from deconstructing tables
2015-01-17 19:57:49 +01:00
Iamgoofball
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
Iamgoofball
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
Iamgoofball
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
tkdrg
ac3c413f24
Merge pull request #6969 from Firecage/Biogenerator_stuff
...
Adds stuff to Biogenerator. STUFF!.
2015-01-16 17:31:25 -03:00
Firecage
dc602f9d57
Indentation fix. How did that single space instead of the tab worl anyway...
2015-01-16 15:38:31 +02:00
phil235
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
Cheridan
63e09d0928
Merge pull request #6966 from Steelpoint/ERTv2
...
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
Firecage
7fdd0556bb
Updates to table/table frame deconstruction
2015-01-15 17:55:51 +02:00
Firecage
f40d799e34
Simply adds a delay to knocking in windows with TK.
2015-01-15 11:49:38 +02:00
paprka
fac0168ecb
improves janicart and adds secway
2015-01-15 01:34:39 -08:00
Firecage
62ddab926f
Fixes amount of mineral gotten from deconstructing tables
2015-01-15 03:31:56 +02:00
pudl
d6d02cb142
Merge branch 'master' of https://github.com/tgstation/-tg-station into eff3shit
2015-01-14 14:54:22 -06:00
Remie Richards
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
tkdrg
82bff079c7
Merge pull request #6137 from Iamgoofball/byond
...
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
Steelpoint
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
tkdrg
d10364797a
Merge pull request #6981 from dannno/bandanno's
...
Bandanas/More jumpsuits in mixed fixed
2015-01-13 21:49:47 -03:00
