cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,179 Commits 61 Branches 14 Tags
fccf8924456262c442872002fb80d07c8a3f829c
Commit Graph

4846 Commits

Author SHA1 Message Date
phil235
fccf892445 Alien third party attack no longer bolded. 2014-04-21 21:30:41 +02:00
Miauw62
24e1e89afb Merge pull request #3260 from Incoming5643/Realism 
Minor fix to improve realism
 2014-04-01 19:55:33 +02:00
Incoming
af47580b20 Humans Named John McClane can crawl through the vents. 
This helps increase realism and believability in our 2D spessman games.
 2014-04-01 12:45:28 -04:00
Razharas
f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian 
April fools
 2014-04-01 05:54:22 -07:00
Miauw62
823c59502f Merge pull request #3234 from Rockdtben/fixAdminDB 
hue
 2014-04-01 14:21:34 +02:00
Cheridan
302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys 
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
 2014-04-01 01:27:39 -05:00
Aranclanos
6c1150dca3 Merge pull request #3143 from Malkevin/saccult 
Sacrifice Cult
 2014-04-01 02:18:39 -03:00
MrStonedOne
25fe463eb2 Ensures re-humaned cyborgs get normal macros. 2014-03-31 22:04:33 -07:00
Cheridan
222f769b0c Merge pull request #3091 from Incoming5643/diehardwithaventgeance 
Fixes #3084
 2014-03-31 21:39:32 -05:00
Cheridan
8b8e7e8a24 Merge pull request #3204 from MrPerson/disposal_verb_tab 
Move disposal pipe verbs to the object tab
 2014-03-31 21:37:49 -05: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
fleure
d38a85bcc0 Merge pull request #3231 from phil235/AddDesigns2 
Adding four boards to the list of R&D circuit designs
 2014-03-31 19:42:26 +01:00
fleure
cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab 
Syndicate Suit Fashion
 2014-03-31 19:35:45 +01:00
fleure
db1ac17930 Merge pull request #3214 from Niknakflak/Lasertagequipment 
Adds Laser Tag Equipment set to admin verb: "Select Equipment"
 2014-03-31 19:27:21 +01:00
Incoming
335c4591ad Just uses Login() 2014-03-31 13:30:19 -04:00
Aranclanos
b84d47717d Merge pull request #3191 from Steelpoint/LaserChange 
Laser Gun Ammo Buff + Sprite Change for Red Laser Tag
 2014-03-31 14:02:21 -03:00
Razharas
d1fbcf2457 Merge pull request #3227 from fleure/tankfix 
Watertank nozzles no longer delete
 2014-03-31 09:48:57 -07:00
MrPerson
e2defa667a Upgrades to the play admin midi client pref 
Toggling it off will pause any songs currently playing. Toggling it back on will resume playback from where you were.
Toggling midis on will play the currently playing admin midi, if there is one.
 2014-03-31 05:41:33 -07:00
Steelpoint
fd32b3ebda Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo 2014-03-31 15:49:08 +08:00
Miauw
83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Rockdtben
117b51be0e Added a better error message 2014-03-29 16:58:55 -05:00
Rockdtben
3d0d5b4fb2 Fixed some issues with the DB admin system 
-erro_admin_ranks table did not exist
-passing a string in to admin new instead of a rank.
 2014-03-29 16:56:42 -05:00
Razharas
ee7f6c314d Merge pull request #3222 from phil235/aloefix 
Changes Aloe cocktail recipe
 2014-03-29 13:36:34 -07:00
phil235
e682348d53 Adding four boards to the list of R&D circuit designs 
Adds the boards for telecom traffic control console, telescience console, mechbay recharger and vendor to the list of R&D designs.
Fixes some minor typos.
 2014-03-29 18:13:04 +01:00
Malkevin
d4e0052d03 mob.dm 2014-03-29 17:05:34 +00:00
Malkevin
c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-29 16:59:14 +00:00
Razharas
6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master" 
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
 2014-03-29 18:02:54 +04:00
Razharas
e63a01aff0 Merge pull request #3220 from Rockdtben/fixFollowBug 
Fixes #2852
 2014-03-29 06:26:06 -07:00
Razharas
594ca98cce Merge pull request #3202 from Niknakflak/WeldMaskTypo 
Fixes Typo with welding masks/goggles.
 2014-03-29 06:21:12 -07:00
Razharas
24491ad36b Merge pull request #3188 from Rockdtben/NewscasterCommandReports 
Newscasters will now show Central Command Updates.
 2014-03-29 06:20:10 -07:00
Razharas
6f9b58abce Merge pull request #3142 from Alek2ander/master 
pAI remote computer control
 2014-03-29 06:18:22 -07:00
Giacomand
96912ce8dc Changed the replica suit/helmet to the black/red version. 
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
 2014-03-29 12:42:23 +00:00
fleure
c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
phil235
81a1f4bb2d changes the aloe recipe to 1 irishcream + 1 watermelonjuice 2014-03-28 22:35:44 +01:00
Cheridan
c8da962b40 Merge pull request #3195 from MrPerson/qdel_ei_nath_REDO 
Make ei nath not destroy brains again
 2014-03-28 13:03:11 -05: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
Rockdtben
5f54c9535b Fixes #2852 2014-03-28 07:59:15 -05:00
Malkevin
3ff519cefc Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 
Conflicts:
	code/modules/mob/mob.dm
 2014-03-28 10:51:48 +00:00
Razharas
3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2 
Click cooldown removal take 2
 2014-03-28 02:39:25 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds. 
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
 2014-03-28 06:32:47 -03:00
Razharas
ff1dfb053c Merge pull request #3168 from YotaXP/qdel-with-datums 
Modified qdel() to accept any datum, among other things.
 2014-03-28 02:14:36 -07:00
Kelenius
1bf9a3ce17 Potency and chemicals fix 2014-03-28 10:20:33 +04:00
MrStonedOne
a26b2252a0 borgified hotkeys for borg players 
changed:
1-3 = module select/toggle
4 = toggle intent
q = unequip active module

changed hotkey help to reflect this for borg players.
 2014-03-27 20:58:55 -07:00
Aranclanos
84ffdd5d2d Merge pull request #3200 from MrStonedOne/MrStonedOne 
Fix for issue 3190 (AI unable to interact with objects after using view-images verb)
 2014-03-27 23:30:22 -03:00
YotaXP
febfa4d1e5 Merge branch 'qdel-with-datums' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
 2014-03-27 21:46:53 -04:00
Niknakflak
6a6b968fbd Adds Red Laser Tag equipment set and Blue laser tag equipment set to the "Select Equipment" Admin verb 2014-03-27 17:35:55 -07:00
Alek2ander
15c374c396 Merge branch 'master' of https://github.com/tgstation/-tg-station 
Conflicts:
	code/modules/power/solar.dm
 2014-03-28 00:02:29 +04:00
Razharas
b61912f27d Merge pull request #3196 from Giacom/solar_fix2 
Fixes solars not correctly working sometimes: Attempt 2.
 2014-03-27 12:48:29 -07:00