cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,826 Commits 61 Branches 14 Tags
8a731f3bdcef95ffff0a024dec01381e4e8d187a
Commit Graph

492 Commits

Author SHA1 Message Date
Rolan7
9c122c6919 Fragile thrown food items use del instead of qdel. This affects tomatoes, blue tomatoes, blood tomatoes, eggs, and pies. Pies and tomatoes now also apply reagents like the other thrown foods. Fixes issue #3561. 2014-04-28 02:40:58 -04:00
Cheridan
3c059ac766 Merge pull request #3539 from phil235/GreyGooFix 
Fix for grey goo in backpack
 2014-04-27 16:33:32 -05:00
phil235
61470ba0d3 removed the parenthesis 2014-04-26 15:57:33 +02:00
phil235
faff653f0d Molten items fix 2014-04-25 13:22:48 +02:00
Cheridan
8cd176c484 Merge pull request #3511 from phil235/CondensedCapsaicinFix 
Fix  condensed capsaicin reagent never disappearing from mob.
 2014-04-24 12:37:16 -05:00
phil235
0f3d6d10be Fix the condensed capsaicin never disappearing from mob. 2014-04-23 18:53:42 +02:00
Cheridan
0ecf8a5d9e Merge pull request #3465 from Giacom/pandemic_fix 
Ports a Pandemic machine fix
 2014-04-21 10:18:19 -05:00
Giacomand
7c297c4262 Ports Pandemic machine fix from https://github.com/NTStation/NTstation13/pull/469 2014-04-20 11:13:43 +01:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Razharas
ffe7f6d4a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull 2014-04-13 00:04:51 +04:00
Razharas
a250e5f670 More !!FUN!! 
Im open to discussion as to remove some of the TOO op mutations
 2014-04-13 00:04:41 +04:00
fleure
1d25935a47 Merge pull request #3294 from RandomMarine/sprayvars 
Spray bottle tweaks and additions.
 2014-04-11 23:08:55 +01:00
Jordie0608
b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
 2014-04-11 02:51:07 +10:00
Miauw
5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
 2014-04-08 14:29:58 +02:00
Miauw62
6748fafb52 Merge pull request #3248 from AnturK/nothinglikeasmellofplasmainthemorning 
Fix for freezing plasma from chemistry
 2014-04-03 20:43:17 +02:00
RandomMarine
6b3b014ee8 Added comments. 2014-04-02 18:30:11 -07:00
RandomMarine
31f2f6924f Click cooldowns! 2014-04-02 18:27:47 -07:00
RandomMarine
c579248a1c Adds variables for spray ranges. 2014-04-02 18:18:17 -07:00
Miauw
1b10254a25 Reverts my and Incoming's April Fools 2014-04-02 20:03:17 +02:00
Razharas
c61fcbd5ed Merge pull request #3230 from Donkie/foodmask 
You can no longer eat/drink or consume pills while having a mask/helmet covering your mouth.
 2014-04-02 10:31:32 -07:00
Razharas
f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian 
April fools
 2014-04-01 05:54:22 -07:00
Jordie0608
79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Aranclanos
6c1150dca3 Merge pull request #3143 from Malkevin/saccult 
Sacrifice Cult
 2014-04-01 02:18:39 -03:00
Malkevin
a35f993c69 Changed the fast move code from a bunch of has_reagents checks to a bitflag check. 
The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
 2014-04-01 00:50:42 +01:00
Cheridan
d92fae006d Merge pull request #3189 from Kelenius/master 
Hydroponics fixes, #2992, #3002, chemicals, attackby()
 2014-03-31 17:58:10 -05:00
Malkevin
0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
AnturK
5dccede8cf Fix for freezing plasma from chemistry 2014-03-31 22:09:21 +02:00
Miauw
dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
 2014-03-30 20:48:03 +02:00
Miauw
83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Daniel
10cd7e255f Initial Commit 2014-03-29 17:16:22 +01:00
phil235
81a1f4bb2d changes the aloe recipe to 1 irishcream + 1 watermelonjuice 2014-03-28 22:35:44 +01:00
phil235
c927269c71 Changes Aloe cocktail recipe 
Changes Aloe cocktail recipe to 1 orangejuice, 1 whiskey, 1 watermelonjuice to avoid conflict with the irish cream recipe (2 whiskey, 1 milk cream)
Fixes #2914
 2014-03-28 17:33:22 +01:00
Kelenius
1bf9a3ce17 Potency and chemicals fix 2014-03-28 10:20:33 +04:00
Kelenius
3ab9e32666 Nutriment class 2014-03-27 08:16:29 +04:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Malkevin
5257a2d3b5 -Made Ian sacrifice less of a "Hey fuck you die". 
-Made it so that each of the three cultists in live sacrifice get a word, to reward team work
-Made hell water not as deadly
 2014-03-26 19:26:28 +00:00
Malkevin
990ed20873 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-26 18:38:07 +00:00
Kelenius
22908ee79a Conflict fix 2014-03-26 12:04:26 +04:00
Aranclanos
90df22689b Merge pull request #3140 from phil235/chocofix 
Reducing the amount of sugar and coco in chocolate bar.
 2014-03-26 03:05:31 -03:00
Aranclanos
9e9dc34ecf Merge pull request #3163 from Mloc/tg-eol 
proper crlf forcing
 2014-03-24 22:47:13 -03:00
fleure
88d2635f7e Merge pull request #3122 from phil235/glassfix2 
Fixes the appearance of some liquid reagents in a glass.
 2014-03-24 15:36:33 +00:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-03-24 08:53:40 +00:00
phil235
bd934359ef fixing typos. Slight buffing of nutriment amounts in some recipes 
Fixing typos, missing periods in food descriptions, two missing descriptions.
Buffing amount of nutriment in some recipes so as to not have less than their ingredients.
 2014-03-23 17:23:34 +01:00
Malkevin
542da7d73b Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/wizard/soulstone.dm
 2014-03-22 21:01:09 +00:00
phil235
0a76e44fef Reducing the amount of sugar and coco in chocolate bar. 
Chocolate bar now contains only 3 nutriment, 2 sugar and 2 coco to match the amounts needed to make the chocolate bar (2milk, 2 coco, 2 sugar).
 2014-03-22 17:52:09 +01:00
Miauw
a80dd4df0f Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
 2014-03-22 17:42:07 +01:00
Aranclanos
565f211155 Merge pull request #2937 from MrPerson/qdel 
qdel() garbage collection system [WIP]
 2014-03-22 04:49:58 -03:00
MrPerson
2858bf1c18 Fix for changling powers arm blade and fleshy space suit. 
More del(AM) -> qdel(AM) and Del() -> Destroy()
Fixes a terrible bug that would have meant players could only ghost once.
 2014-03-21 22:26:50 -07:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
 2014-03-21 03:05:39 -07:00
Malkevin
5665966c94 cult.dm - made the objectives always be declared in ticker.mode 
changed the var name from objectives to cult_objectives

cultists hitting mobs (and only mobs) will convert any holy water to unholy water

trying to summon narsie when shes not an objective will dose all the summoners with hell water

chaplain with his bible can purify the unholy water in a container

wrote the sac act for corgis - this will cause !!FUN!! to the sacrificer

Holy water will deconvert cultists now, takes around 2 minutes

Unholy water generally buffs cultists, but causes brain damage. Its very poisonous to non-cultists.

Hell water - this is a punishment reagent, amongst other bad affects chiefy it (re)sets people on fire

Misc: Fixed hyperzine being double consumed.
 2014-03-21 00:03:42 +00:00