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

4805 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
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
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
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
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
0b1ba613b6 Merge pull request #3177 from phil235/earmuffsfix 
Fixing being able to hear with earmuffs on.
 2014-03-27 06:52:43 -03:00
Niknakflak
f9f58e1253 Fixes Typo with welding masks/goggles. 2014-03-26 20:31:13 -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
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
phil235
9701dd16ae Only checking for earmuffs once. 2014-03-26 15:10:08 +01:00
Rockdtben
1de30e3d22 Made the admin command Access Netscastor Network use the news_network procs. 2014-03-26 08:23:39 -05:00
Giacomand
c0d6e47e7e Merge branch 'master' of https://github.com/tgstation/-tg-station into SQDL2 
Conflicts:
	tgstation.dme
 2014-03-26 08:00:20 +00:00
Aranclanos
eded7cf127 Merge pull request #3181 from MrPerson/qdel_DEL_THE_MOBS 
Make most mobs del() instead of trying to GC them.
 2014-03-26 03:37:31 -03:00
Aranclanos
2615633444 Merge pull request #3180 from Nienhaus/master 
New Hair
 2014-03-26 03:36:28 -03:00
Aranclanos
34757f900e Merge pull request #3161 from Giacom/gravity_changes 
You will fall over in zero gravity, again, but you won't make a noise.
 2014-03-26 03:27:20 -03: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
Nienhaus
2b168b3ddb Genderless 2014-03-25 10:47:56 -05:00
MrPerson
667a773553 Make most mobs del() instead of trying to GC them. 
Don't try to Destroy() objects that get del(). It was causing infinite loops and other problems. It's now ok to have something call del(src) as part of Destroy().
 2014-03-25 08:44:40 -07:00
Nienhaus
1d01d07ade New Hair 
Adds a side pony tail, longer over the eye hair, a braid along with a
front braid, a bun, an ahoge, pig tails, and a over used anime protag
hair style.
DMI of the new hair. http://puu.sh/7IAKi.dmi
 2014-03-25 09:19:20 -05:00
Giacomand
3811c9af05 Added world.log and log_game() to the SQDL logging. 2014-03-25 10:27:03 +00:00
Giacomand
65602cb72d Added admin logging for the gravity generator. 2014-03-25 10:12:33 +00:00
Incoming
6b83a8d2e0 I am crying. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
 2014-03-24 22:13:43 -04:00
phil235
cc50291765 missed a parenthesis 2014-03-25 03:11:05 +01:00
phil235
3695a916ea Fixing being able to hear with earmuffs on. 
I hope I didn't make any mistake, this should prevent ear_deaf from flickering between 0 and 1 while wearing earmuffs.
 2014-03-25 02:58:47 +01: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
fleure
43a6e111c5 Merge pull request #3118 from VistaPOWA/cyborg_module_in_telecomms 
Adds the Cyborg module into the messages received by the AI
 2014-03-24 15:08:25 +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
YotaXP
3656217c29 Modified qdel() to accept any datum. 
The garbage controller no longer bothers nulling out every variable on destroyed objects.
An object can opt to not be collected by returning true from Destroy().  Useful for pools or other edge cases.
Fixed boxes not being collected, along with a couple other things.
Turfs will not be monitored for collection.
generate_ion_law() is no longer a /datum proc, and I am an admin in the repo.  Deal with it.
 2014-03-24 00:10:43 -04:00
Giacomand
3d509f84e3 Added examples. 
Removed a now unnecessary workaround.
 2014-03-23 23:07:52 +00:00