cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-26 17:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,098 Commits 59 Branches 14 Tags
b84d47717dca0e292cd8d8266e77935b60715f0f
Commit Graph

8903 Commits

Author SHA1 Message Date
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
Aranclanos
a140850349 Merge pull request #3242 from Aranclanos/HappyCLicks 
Making the game better for everyone.
 2014-03-30 22:14:20 -03:00
Aranclanos
f411ff8dfa Merge pull request #3238 from Giacom/advance_cache 
Advance diseases cache the generated id to help stop the amount of calls to sortList.
 2014-03-30 22:13:45 -03:00
Aranclanos
594443cf5e For the start of the month, I'll make combat more robust because I think everyone is pretty unrobust. 
This won't be reverted.
Happy clicks.
 2014-03-30 22:12:24 -03:00
Giacomand
d07519629c Advance diseases cache the generated id to help stop the amount of calls to sortList. 2014-03-30 12:44:00 +01:00
Razharas
039e816872 Merge pull request #3223 from GunHog/Proxsensor 
Adds prox sensor to the autolathe.
 2014-03-29 14:38:28 -07:00
Razharas
ee7f6c314d Merge pull request #3222 from phil235/aloefix 
Changes Aloe cocktail recipe
 2014-03-29 13:36:34 -07: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
c320676170 Merge pull request #3213 from Incoming5643/ventfixer 
Fixes a small bug in ventcrawling
 2014-03-29 06:25:17 -07:00
Razharas
79d255be20 Merge pull request #3203 from MrPerson/qdel_table 
Make wrenching tables apart not drop the wrench
 2014-03-29 06:24:23 -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
Razharas
eda7110a23 Merge pull request #3184 from Donkie/bibleupdate 
Biblish update
 2014-03-29 06:15:20 -07:00
fleure
7933fe424b Merge pull request #3194 from Razharas/LingSting 
Fixes transformation sting working improperly
 2014-03-29 12:53:15 +00:00
fleure
c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
GunHog
3c0a035b30 Update autolathe.dm 
Added the proximity sensor to the autolathe.
 2014-03-28 18:34:06 -05: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
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
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
MrStonedOne
17a32fb60d Fixing rouge newline added by github 2014-03-27 17:52:23 -07:00
Incoming
a938b90034 Fixes a small bug in ventcrawling that allowed crawlers to avoid things that relied on area.Entered. Mostly the turrets in the AI Core/upload. 
Reported http://www.ss13.eu/phpbb/viewtopic.php?f=42&t=9&start=1900#p126318 . NEXT TIME USE GIT.
 2014-03-27 19:05:54 -04:00
MrStonedOne
98245935e7 Update ai.dm 2014-03-27 15:51:40 -07:00
Razharas
9e8a37c27e Merge pull request #3209 from fleure/secfixtwo 
Fixes sec department access. I hope.
 2014-03-27 14:02:35 -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
Alek2ander
8fa4005c24 Moved paicard check to /obj/machinery/computer 
BSA control computer now a valid pAI control target. !!FUN!!
 2014-03-27 23:43:05 +04:00
fleure
391b669f57 Fixes sec department access. I hope. 2014-03-27 19:32:22 +00:00
Alek2ander
006a7e2d40 Removed pAI check in attack_hand 
Added pAI check in the Security Camera Console instead.
All the others seem fine.
 2014-03-27 19:16:16 +04:00
Alek2ander
358ecf7e6a Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master 
Conflicts:
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/telecrystalconsoles.dm
 2014-03-27 18:31:11 +04:00
Aranclanos
02d8594634 Merge pull request #3186 from phil235/cleaningbotfix 
Fixing message typo and adding new cleaning targets to cleanbot
 2014-03-27 06:59:11 -03:00
Aranclanos
0b1ba613b6 Merge pull request #3177 from phil235/earmuffsfix 
Fixing being able to hear with earmuffs on.
 2014-03-27 06:52:43 -03:00
MrPerson
481427a46f Make wrenching tables apart not drop the wrench 2014-03-26 20:34:08 -07:00
Niknakflak
f9f58e1253 Fixes Typo with welding masks/goggles. 2014-03-26 20:31:13 -07:00
MrStonedOne
e8e25978e7 Update ai.dm 2014-03-26 17:15:23 -07:00
Razharas
f24dd84565 Merge pull request #3187 from phil235/pierrotfix 
fixing the cure description for Pierrot's Throat.
 2014-03-26 16:56:00 -07:00
MrStonedOne
f374d4c8fe Fix for issue 3190 
Fixes deletion of src object rather than the intended p objected, also
ensures ai/onclick doesn't depend on the photography module being
present or bug free by gracefully handing the lack of a aicamera object.
 2014-03-26 16:46:38 -07:00
Incoming
e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic 
Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm
 2014-03-26 13:03:12 -04:00
Giacomand
da71bad8e2 Modernised the solar control computer's UI. 
Cleaned up the solar code a bit.
Removed trackers requiring power, should stop them from being processed.
 2014-03-26 16:28:33 +00:00
MrPerson
1fa3dbde0c Make ei nath not destroy brains 
Also small tweaks to make spells GC if you use the spellremove() proc.
 2014-03-26 08:38:26 -07:00