cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 23:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,923 Commits 61 Branches 14 Tags
ecb3a4e08f4aef281ded2726cbdd671db4f76937
Commit Graph

1336 Commits

Author SHA1 Message Date
Cheridan
e5428c1519 Merge pull request #8256 from phil235/StrangenessTextFix 
Strangeness text, janicart, alien nest, weak golem fixes
 2015-03-13 15:23:30 -05:00
phil235
51e3bef054 Merge pull request #8294 from norill/mutfix 
acquiring negative mutations shows in red in chat
 2015-03-12 20:11:28 +01:00
norill
5ef5c5444d acquiring negative mutations shows in red in chat 2015-03-11 17:11:35 +01:00
phil235
8a1a5ff832 Fixes Strangeness mutation gain text not appearing. 2015-03-09 16:49:31 +01:00
Cheridan
e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack! 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
 2015-03-09 01:47:40 -05:00
hornygranny
d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops 
Nuke Op Loot Pinata Tweaks
 2015-03-06 11:48:07 -08:00
Cheridan
07676b352d Merge pull request #8128 from Ikarrus/gangfixup 
Makes Gang mode functional again
 2015-03-05 21:11:59 -06:00
Ikarrus
9b28452bfe Makes Gang mode functional again 
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.

A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.

It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
 2015-03-02 23:46:46 -07:00
Cheridan
73658a8c0b Updates SSU, Reprices Explosive Implants 2015-03-02 00:09:37 -06:00
Ikarrus
15c10dd427 Preserve Objectives when admin-removing antag status 
Sometimes admins want to change someone's antag type or simply refresh their antag status to fix bugs, while still preserving their objectives.  Being forced to lose them makes these really frustrating to do!

Admins can still manually remove their objectives from the same window (Mind Window/Traitor Panel).
 2015-03-01 21:08:14 -07:00
hornygranny
f64fb21f47 Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage! 
Fixes #7288 VV, moreinfo stamina display and replaces CA with TP
 2015-02-25 19:53:41 -08:00
Jordie0608
6b815c7801 Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP 2015-02-24 20:02:43 +11:00
Iamgoofball
4735e1c02a Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 2015-02-23 18:47:21 -08:00
Razharas
e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding 
Items Embedding in Limbs
 2015-02-24 01:22:01 +03:00
hornygranny
a5a7b590d3 Merge pull request #7866 from phil235/PullBuckleFix 
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
 2015-02-22 20:18:54 -08:00
hornygranny
7b8a8a3308 Merge pull request #7870 from phil235/WindowFormattingFix 
Two window fixes
 2015-02-22 20:18:21 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
Swag McYolosteinen
8e4982276a Merge pull request #7825 from RandomMarine/cargokits 
Adds brute first aid kits to cargo.
 2015-02-22 12:06:22 +01:00
phil235
19e3cd5d1e Fixes a window's size and a colored text in another one. 2015-02-21 16:24:13 +01:00
phil235
e9a943218c Fixes being able to break free from a pull while handcuffed if the puller is buckled. 
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
 2015-02-21 14:49:47 +01:00
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
 2015-02-20 22:00:53 -08:00
Sometinyprick
e5b53f2e3c Finishing up 2015-02-21 01:26:58 +00:00
hornygranny
ea12d68e60 Merge pull request #7817 from paprka/whatthefucktg 
Syndicate shotguns spawn with buckshot by default
 2015-02-19 13:07:08 -08:00
Remie Richards
42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-02-19 18:16:33 +00:00
Menshin
0d0ef9e02a Deactivates the Hidden Syndicate Teleportation Device 2015-02-19 16:34:49 +01:00
RandomMarine
b0d591f110 Adds brute kits to cargo 2015-02-18 20:41:47 -08:00
paprka
efbb4f5116 makes syndicate shotguns spawn with buckshot by default 2015-02-18 14:10:46 -08:00
Sometinyprick
52477eb16e Adds a new spell. The Barnyard curse 
Created a new file because I didn't want to get rid of the horseman
curse. Essentially the same as the horseman curse but you can also be a
pig and a cow.
 2015-02-17 00:44:45 +00:00
phil235
c9f9d30227 Air Alarm Deconstruction fix: you no longer need to cut the syphon wire to deconstruct the air alarm. 
You can no longer open or interact with the wire window after the wires are removed.
You can no longer cut the final wire while the panel is closed.
Adding wires to the air alarm now properly reset the variables that the wires change upon cutting/pulsing.
 2015-02-14 17:53:22 +01:00
paprka
88760896ad initial commit 2015-02-13 20:59:39 -08:00
Remie Richards
34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
Cheridan
216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06:00
phil235
549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
 2015-02-11 16:13:04 +01:00
Cheridan
65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
Iamgoofball
575b117a70 Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	icons/obj/drinks.dmi
 2015-02-10 21:37:49 -08:00
Swag McYolosteinen
e5e8b27790 Merge pull request #7491 from paprka/simplyepicbuff 
Removes range from ebow bolts + price revert + bugfix
 2015-02-10 17:15:44 +01:00
paprka
3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
Iamgoofball
0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
 2015-02-07 15:46:12 -08:00
Iamgoofball
eea438c42d Literal shitton of changes 2015-02-07 15:37:55 -08:00
phil235
35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
 2015-02-07 20:22:49 +01:00
TZK13
1ff9f89062 Fixes revitiligo. 2015-02-05 17:00:54 -06:00
phil235
3456b017b6 repo update 2015-02-05 23:00:59 +01:00
phil235
e4464b3b9f Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 2015-02-05 22:35:00 +01:00
Razharas
b9363249b3 Merge pull request #7471 from Menshin/properly_propelled_sanitization 
HTML sanitization tweaking
 2015-02-05 22:27:35 +03:00
Swag McYolosteinen
f5359aba3b Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo 
Adds photos and some other stuff to security and medical records
 2015-02-05 18:45:53 +01:00
Swag McYolosteinen
5cb2392f1e Merge pull request #7197 from TZK13/New-Disease-Symptoms 
Adds three new disease symptoms
 2015-02-05 18:09:53 +01:00
Swag McYolosteinen
ac60a828f9 Merge pull request #7536 from Iamgoofball/chemblob 
fixes my shit
 2015-02-05 18:04:54 +01:00
phil235
faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay) 
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
 2015-02-05 16:48:25 +01:00
Lo6a4evskiy
50cc057504 Lots of fixes and improvements 2015-02-04 17:35:42 +04:00
Iamgoofball
9a1036d43b Fixes #6991 2015-02-03 20:26:58 -08:00