cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 13:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,093 Commits 61 Branches 14 Tags
d4e0052d034b8f17663f8fb032120ce64d8cf77f
Commit Graph

8903 Commits

Author SHA1 Message Date
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
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
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
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
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
Malkevin
cd6c1272ad Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-27 13:18:46 +00: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
Malkevin
67fc35a262 Fixed a likely exploit with more cultists getting word rewards than intended 2014-03-26 21:38:39 +00:00
Malkevin
96a892cacc Removed some debug check 
Fixed the Debugger not selecting antags
 2014-03-26 19:49:14 +00: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
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
Razharas
dce01baf89 Fixes transformation sting working improperly 2014-03-26 18:51:49 +04:00
Daniel
e775933982 Fixed indentation, bookname 2014-03-26 15:44:47 +01:00
Daniel
b53bc9c2b7 Absolute paths, fixed spelling, updated inhand 2014-03-26 15:37:31 +01:00
phil235
3db5e0d137 Changing cure description to "Banana products, especially banana bread." 2014-03-26 15:36:48 +01:00
phil235
9701dd16ae Only checking for earmuffs once. 2014-03-26 15:10:08 +01:00
phil235
6287013014 moving dirt from blood targets to normal targets 2014-03-26 14:48:33 +01:00
Rockdtben
1de30e3d22 Made the admin command Access Netscastor Network use the news_network procs. 2014-03-26 08:23:39 -05:00