c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
55208e408d
Merge pull request #7419 from paprka/beltoveray
...
adds a simple overlay system for belts
2015-02-20 07:06:20 +03:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
1b24461841
Fix syndicate briefcase not having cash.
...
Fix returns, fix everything.
2015-02-09 18:06:20 +00:00
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
2ef8848c74
adds ability to store ammo and any type of revolver in holster
2015-02-05 17:41:10 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
d8823a8038
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
2015-02-02 19:30:24 -05:00
c18f485b17
fix shit, make bible suicide sacrifice you to your deity
2015-02-02 15:13:17 -05:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
f8bb02d54a
Merge pull request #7422 from Steelpoint/ERTBalance2
...
ERT Balance Pass 2 | ERT Access and Foam
2015-02-01 20:16:04 -06:00
c48bf44a47
framework for a future "suicide hotline" job
2015-02-01 19:44:54 -05:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
1ce5722eac
map conflicts and other changes
2015-01-31 23:14:12 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
d47f6334c3
fixes dufflebag max weight class
2015-01-29 16:05:33 -05:00
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
18fe642fcc
ERTBalanceV2
2015-01-29 19:03:07 +08:00
9bece71e1d
adds a simple overlay system for belts
2015-01-28 20:27:44 -08:00
46f588b424
Merge pull request #7334 from Xhuis/portable_console_in_belt
...
Lets you store handheld crew monitors in medical belts
2015-01-28 09:41:04 -06:00
1c81aa37a9
Merge pull request #7330 from Menshin/variables_clusterbangs
...
Ported the variable payload clusterbangs from sayustation
2015-01-28 09:25:50 -06:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
87dc5bafdd
Fixes error
2015-01-24 17:00:56 -05:00
266acdaac5
Lets you store handheld monitors on medbelts
2015-01-24 16:48:27 -05:00
50e927ea33
Merge pull request #7314 from paprka/holster
...
fixes holster weight class
2015-01-24 16:48:05 +01:00
8f10dea61a
Ported the variable payload clusterbangs from sayustation.
2015-01-24 16:36:30 +01:00
8dfaed5fe4
Merge pull request #6871 from fleure/syndiebux
...
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
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
30348d8cdd
Merge branch 'master' of https://github.com/tgstation/-tg-station into holster
...
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
2015-01-23 16:48:30 -08:00
f487b70b65
fixes holster weight class
2015-01-23 16:47:00 -08:00
9fd1c313d0
resolve conflicts
2015-01-23 01:36:58 -05:00
28bff00e6a
removes 2 syndie bags, removes slowdown from syndie bags
2015-01-22 23:49:14 -05: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
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
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
a643ecdfcc
Food and drinks refactor
2015-01-19 18:06:15 +11:00
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -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
hornygranny
Razharas
paprka
Cheridan
xxalpha
dannno
Swag McYolosteinen
Steelpoint
Xhuis
Menshin
Jordie0608
pudl
drynwyn
Iamgoofball