cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,321 Commits 61 Branches 14 Tags
f2f7ee616df010b4cf3e7ca1dc6d9d4e9011e45b
Commit Graph

2511 Commits

Author SHA1 Message Date
hornygranny
22e96d3377 Merge pull request #7277 from pudl/chemfix 
replaces all instances of pacid with facid
 2015-01-22 17:06:46 -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
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
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
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
pudl
e78e3e5118 adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots. 2015-01-20 23:16:21 -06: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
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
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
carnie
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
Firecage
950bc17c23 Gives the monkey dexterity message to some stuff. 2015-01-18 11:48:53 +02:00
Iamgoofball
b64efc6b54 Adds 3 new disabilities 2015-01-17 18:55:41 -08:00
paprka
f797b04e15 adds shoulder holster for the detective 2015-01-17 17:11:38 -08:00
paprka
1b6831dab1 splits gun.dmi up into multiple files 2015-01-17 15:34:30 -08:00
tkdrg
059d8cf650 Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention 
Some disposals cleaning/stacking fix
 2015-01-17 17:16:52 -03:00
Iamgoofball
bc9d48fa42 Mutadone and Mannitol, tweaks and changes. 2015-01-16 19:28:13 -08: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
Remie Richards
c08e4e4332 Merge pull request #7084 from JJRcop/ChronOPS 
Adds Chronosuit and T.E.D
 2015-01-17 01:02:52 +00:00
Sawu
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
tkdrg
ac3c413f24 Merge pull request #6969 from Firecage/Biogenerator_stuff 
Adds stuff to Biogenerator. STUFF!.
 2015-01-16 17:31:25 -03:00
JJRcop
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
paprka
eae84c1c39 further conflicts and bugfixes 2015-01-15 21:59:36 -08:00
paprka
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
Cheridan
63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
carnie
a44795a699 Resolves #6993 - Moved pai controller into a subsystem. 2015-01-15 23:50:46 +00:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
Menshin
8d1ebf3ad1 * Prevent stacking of dense disposal constructs (bin, outlet, chute) 
* Some general code cleaning (less snowflaking)
 2015-01-15 20:05:15 +01:00
JJRcop
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
JJRcop
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
JJRcop
4c8f890f88 Adds Timeline Eradication Device 2015-01-15 02:18:04 -05:00
phil235
884e2a6f73 Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message. 2015-01-14 18:00:17 +01:00
Sawu
0de72483bc Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-14 18:35:29 +11:00
tkdrg
82bff079c7 Merge pull request #6137 from Iamgoofball/byond 
Goon Chemistry [FINISHED]
 2015-01-14 02:31:56 -03:00
paprka
8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08: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
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz 
Replaces a bunch of input() with stripped_input()
 2015-01-13 19:32:25 +01:00
Cheridan
c81eada938 Merge pull request #6737 from tkdrg/hurr 
Changes the practice beam name to "practice laser"
 2015-01-13 02:13:38 -06:00
Steelpoint
1a0cc48566 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 
Conflicts:
	icons/obj/gun.dmi
 2015-01-13 15:32:28 +08:00
Cheridan
4bd70b2908 Merge pull request #6986 from Menshin/ear_damage_ooping 
Ear damage/deafness tidying
 2015-01-13 01:19:56 -06:00