cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,855 Commits 61 Branches 14 Tags
e596ffe2ba5ea5c2bb225170b794a6dc89200906
Commit Graph

7094 Commits

Author SHA1 Message Date
Giacom
e596ffe2ba Merge pull request #2001 from EuroNumbers/master 
Turbine v2.0 - first step
 2013-12-13 09:36:09 -08:00
Giacom
b0c36c2709 Merge pull request #2005 from ACCount12/master 
Syringe gun - now 80% more gun! Fixes #1935
 2013-12-12 16:16:16 -08:00
Aranclanos
c04938cbc1 Merge pull request #1968 from Adrinus/12-03-13-Orion_Trail 
Adds a new Arcade Machine.
 2013-12-11 16:37:11 -08:00
Cheridan
193d63c0e1 Merge pull request #2008 from Giacom/xmas_newshat 
Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event.
 2013-12-11 09:47:53 -08:00
Aranclanos
1ee59747c4 Merge pull request #1940 from YotaXP/HTML-Entities-and-Timestamps 
NTSL, parrots, and ID consoles hate apostrophes less.
 2013-12-10 04:53:09 -08:00
Aranclanos
8f1f632b35 Merge pull request #2000 from Cheridan/PlantThatGrows357Revolvers 
Plant that grows 357 revolvers
 2013-12-09 17:43:35 -08:00
Adrinus
6402574be8 Made emp_act available to all arcades. Made prize vending with filled boxes a proc for use by any arcade machine. Names of your crew are now generated from the same name lists as random characters. Cleaned up the Topic code so there were less duplicate lines. 2013-12-09 15:41:27 -05:00
Giacomand
25c43d0a98 Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event. 2013-12-09 19:35:31 +00:00
Cheridan
edce4a5d40 Merge pull request #1952 from Ikarrus/nuke 
Adjustments to nuke object
 2013-12-09 11:21:39 -08:00
Cheridan
2dad72b63a Merge pull request #1993 from Razharas/master 
Added tips when setting/unsetting stings
 2013-12-09 10:33:48 -08:00
Razharas
9aca471af5 More consistency in grammer 
Thats what you get for not being a native english speaker
 2013-12-09 22:25:27 +04:00
Cheridan
06aedac73d Merge pull request #1960 from Ikarrus/voteresults 
Detailed Vote Results
 2013-12-09 10:21:26 -08:00
Giacom
caa8190d61 Merge pull request #1994 from cem/chem 
Increase Chem Dispenser window height
 2013-12-09 08:30:03 -08:00
ACCount
5fde461f1e Syringe gun wants to be real gun! 2013-12-09 21:40:51 +12:00
EuroNumbers
29d637240f Update turbine.dm 
Replaced outdated code that wounded up there for no reason.
 2013-12-09 01:25:10 +01:00
EuroNumbers
64c08c6482 Update turbine.dm 
Made compatible with LINDA
 2013-12-09 00:17:03 +01:00
EuroNumbers
372992ca36 Lowercased "gas turbine control computer" 2013-12-08 22:47:29 +01:00
EuroNumbers
c2a4de92cc Update turbine.dm 
Turbine now works as intended in rev4407
Tweaked the power generation too to fit the increased demand
Still needs a better computer code
 2013-12-08 21:33:25 +01:00
Cheridan
20b1c54ec4 Merge pull request #1999 from Aranclanos/commitpls 
Makes the code compile
 2013-12-08 11:38:44 -08:00
Cheridan
f96755857d The plant that grows .357 revolvers. 2013-12-08 13:32:33 -06:00
Aranclanos
de11cd2934 for extra prettiness, the (x,y,z) coordinates on the game logs of transfer valves no longer have spaces between them. 2013-12-08 16:10:58 -03:00
Aranclanos
cd9778c7db Fixes the code not compiling. I blame myself. And everyone else. 2013-12-08 16:08:37 -03:00
ikarrus
8cd9300800 Removed percentages and added a "Did not vote" count for custom votes. (Non-voters get automatically added to status quo option in non-custom votes) 2013-12-08 11:34:12 -07:00
Cheridan
b949afd872 Merge pull request #1970 from Ikarrus/adminnotice 
Admin Notices
 2013-12-08 10:32:45 -08:00
Ikarrus
e31f8b6afe Added feedback when anchoring fails 2013-12-08 10:33:53 -07:00
Cem Kocagil
d29f583062 Increase Chem Dispenser window height 2013-12-08 18:34:59 +02:00
Aranclanos
552c77fd81 Merge pull request #1990 from VistaPOWA/aluminium 
Replaces 'aluminum' with 'aluminium'.
 2013-12-08 07:32:54 -08:00
Aranclanos
498ba1acd4 Merge pull request #1964 from Limeliz/href-fixes-round-3 
Href fixes round 3
 2013-12-08 07:10:15 -08:00
Razharas
85993256c3 Damn grammer 
Can't
 2013-12-08 18:34:18 +04:00
Razharas
d43a65c49e Adds tips when setting/unsetting stings 
Now its a bit more obvious how to use new ones
 2013-12-08 18:27:26 +04:00
Pete Goodfellow
9692e1a70c Merge pull request #1973 from KazeEspada/lootfix 
Lootspawner bug fix.
 2013-12-08 04:09:16 -08:00
Aranclanos
c6db228a46 Merge pull request #1936 from Perakp/faceHuggerRuntime 
Fixes alien embryos from runtiming when checking limbs
 2013-12-08 02:41:07 -08:00
Aranclanos
11bf118652 Merge pull request #1982 from Giacom/ghost_colours 
Added anonus' rainbow ghost icons for BYOND member content.
 2013-12-08 02:37:39 -08:00
Aranclanos
5cf0f4765f Merge pull request #1929 from adrix89/Equip 
Quick equip active storage,toolbelt,backpack.
 2013-12-08 02:03:34 -08:00
Aranclanos
8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013 
Conflicts:
	html/changelog.html
 2013-12-08 06:29:48 -03:00
Aranclanos
124e1b7019 Merge pull request #1881 from AndroidSFV/checkmobfacingproc 
Compare mob facing helper proc [Review and discuss before merge]
 2013-12-08 01:06:30 -08:00
Aranclanos
bf3c617cea Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange 2013-12-08 05:41:59 -03:00
Aranclanos
15c4ffdb57 Fixes the href links on the game logs related to syndicate bombs 2013-12-08 05:40:50 -03:00
AndroidSFV
14e26a64a2 Removed the pAI check. Dont entirely agree with it, but I am a team player~ 2013-12-07 13:41:02 -06:00
VistaPOWA
1041d7081d Replaces 'aluminum' with 'aluminium'. 
Hopefully there won't be a grammar war because of this.
 2013-12-07 14:42:25 +01:00
Giacom
c1304ef0c8 Merge pull request #1971 from adrix89/Crate_Explostion 
Fixed crate not blowing up properly.
 2013-12-07 04:54:09 -08:00
Incoming
ca920321ae Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-12-06 12:20:35 -05:00
Giacomand
eb3f07e538 Added anonus' rainbow ghost icons. 2013-12-05 18:34:24 +00:00
Aranclanos
870d23ccf4 Merge branch 'icons' of https://github.com/Jordie0608/-tg-station into icons 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/weapons.dmi
 2013-12-05 08:32:53 -03:00
Aranclanos
a0a01e840e Removed some items from the spawn_forbidden list of sandbox mode. That list is not for potential "grieff" items. 2013-12-05 08:19:52 -03:00
Aranclanos
ec79981b3a Merge branch 'sandbox' of https://github.com/cookingboy3/-tg-station into sandbox 2013-12-05 07:52:31 -03:00
Aranclanos
2a07f06ba8 Merge pull request #1932 from Giacom/op_meteor2 
Tweaked meteors to stop playing unnecessary sounds.
 2013-12-05 02:46:51 -08:00
Aranclanos
f6f9f0f050 Removed a leftlover in click code and fixed changeling stings because they weren't working why aren't they working why don't they work, I keep asking that, it's a PR about changelings stings, but they don't work, why they don't work little black ball of destiny, I just want to know why they don't work on the PR that says that they will work, why why why 2013-12-05 07:35:29 -03:00
Aranclanos
a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
 2013-12-05 07:01:09 -03:00
cookingboy3
42d5cd529f Infinite cell button fix, more banned items. 2013-12-04 18:28:11 -08:00