cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,246 Commits 61 Branches 14 Tags
fbb0c67ebb8e65fc2b8a9717015221f0f2b754ec
Commit Graph

4219 Commits

Author SHA1 Message Date
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
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
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
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
Swag McYolosteinen
0ebd227f71 Merge pull request #7034 from paprka/nosenseofrightandwrongiguess 
Crossbow, speargun, and grenade updates
 2015-01-16 16:43:50 +01: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
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
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
Swag McYolosteinen
2082baa64b Merge pull request #7042 from phil235/AudibleMessageRuntimeFix 
Fixes some runtimes from audible_message proc.
 2015-01-15 19:14:31 +01: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
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
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
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
tkdrg
d10364797a Merge pull request #6981 from dannno/bandanno's 
Bandanas/More jumpsuits in mixed fixed
 2015-01-13 21:49:47 -03:00
pudl
bd565e5138 eff 3 update/locker fix 
updates efficiency 3
-adds araneus, renault, and wags-his-tail
-adds an extra sink to medbay
-lots of player-requested fixes
-gives the cmo a medical hardsuit
-fixes catwalk inconsistency
-cosmetic changes to the HOS' office
-bartender now has a closet full of outfits for potential employees

additionally, this makes a very small code change. white wardrobes now start with 3 white softcaps.
 2015-01-13 15:15:14 -06: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
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
Iamgoofball
5a91ce4fee Requested changes by @Cheridan 2015-01-12 20:38:56 -08:00
Cheridan
f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Cheridan
03e1d0d60a -Adds firing pin box define 
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
 2015-01-12 21:21:34 -06:00
Iamgoofball
f527d53e3e Increases the cigarette chemical cap as per request by @Miauw62 2015-01-12 19:01:52 -08:00
Menshin
435ccf7ff9 * OOP'ed ear damages/deafness status updating 
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
 2015-01-13 00:40:46 +01:00
dannno
3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's 
Conflicts:
	config/admins.txt
 2015-01-12 15:55:51 -05:00
tkdrg
379b7b83fc Fixes a missed variable 2015-01-11 20:00:41 -03:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input() 
Some of these were exploitable for XSS, as well.
 2015-01-11 19:02:53 -03:00
dannno
f8573ba257 u know what it is 2015-01-11 16:08:21 -05:00
Firecage
c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00