cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,730 Commits 61 Branches 14 Tags
397af681006082c44edb9118348f1bbdfd3a6f46
Commit Graph

3719 Commits

Author SHA1 Message Date
Aranclanos
397af68100 Merge pull request #1946 from Limeliz/master 
Removes more href-tags from game logs.
 2013-12-02 13:54:42 -08:00
Giacom
8d1a0fd552 Merge pull request #1943 from YotaXP/Fixes-1867 
Fixes Issue #1867
 2013-12-02 13:44:45 -08:00
Aranclanos
fe6f4ff0df Merge pull request #1945 from Giacom/reduce_getturf 
Reduces the amount of get_turf calls.
 2013-12-02 12:59:04 -08:00
Aranclanos
d4a4a817d4 Merge pull request #1922 from TZK13/Mushroom-Adjustments 
Adjustments to mushrooms
 2013-12-02 12:41:34 -08:00
Giacomand
088cb5afd3 Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak 
Resolved Conflicts:
	html/changelog.html
 2013-12-02 20:20:35 +00:00
Aranclanos
f89f2c5c0d Merge pull request #1890 from Giacom/disposals_map 
[MAP] Modified the disposals room to have a crusher and a stacking machine
 2013-12-02 11:43:43 -08:00
Cheridan
4e2c97bf3f Merge pull request #1910 from Giacom/issue_1908 
Adds a stat check for AI vocal announcements. Fixes #1908
 2013-12-01 21:18:21 -08:00
Cheridan
70ca13a953 Merge pull request #1888 from Malkevin/tunic 
Expanded the suit storage for the Captain's Tunic
 2013-12-01 19:57:10 -08:00
Emil
b642db40a1 Reverting a change I never did? 2013-12-01 23:30:22 +01:00
Emil
fd61d1f9bd Fixed a mistake in newbanjob.dm 
Accidently removed the href tags from an ingame message earlier.
 2013-12-01 23:26:59 +01:00
Limeliz
7629c5d4a3 I found #1870 in more places. 
Replaced [key_name_admin(usr)] with [key_name(usr)] in all logging, to remove href-tags from logfiles.
 2013-12-01 23:18:59 +01:00
Giacomand
449a391dc5 Reduces the amount of get_turf calls. 
Removes random noises.
 2013-12-01 18:51:29 +00:00
Giacom
9422233976 Merge pull request #1926 from VistaPOWA/begone_debug_message 
Removes an annoying debug(?) message from hydroponics.
 2013-11-30 17:23:24 -08:00
Giacom
59cdb97792 Merge pull request #1931 from Aranclanos/LARVAAAAAAAAAAAAAAAS 
Fixes the runtimes related to alien larvas and plasma display
 2013-11-30 17:21:07 -08:00
YotaXP
cb6896489f Fixes Issue #1867 2013-11-30 16:42:08 -05:00
Rockdtben
9492f102b9 Merge pull request #1903 from YotaXP/Fix-Borg-APC-Access 
Fixes Cyborg APC Access
 2013-11-29 15:09:13 -08:00
Aranclanos
6b9d399298 Larvas won't try to use their non-existant plasma display and runtime to hell anymore. 2013-11-29 08:33:24 -03:00
Giacom
9d4a084b35 Merge pull request #1907 from Aranclanos/FixingSounds 
Sound runtimes
 2013-11-28 19:10:19 -08:00
TZK13
ce063d78cf Returned the amount of sleep toxin in reishi back to what it was before. 2013-11-28 14:17:08 -06:00
Giacom
952f0aadb7 Merge pull request #1912 from KazeEspada/clusterbang 
Clusterbang launcher improvements.
 2013-11-28 11:46:10 -08:00
VistaPOWA
abb2b6bdf6 Removes an annoying message from hydrophonics. 
It's been bothering me for some time., it looks out of place and it's
not like that the botanist won't notice it. (No idea why some empty
lines were modified)
 2013-11-28 20:19:24 +01:00
TZK13
e4de436a1e Renamed psilocybin to mushroom hallucinogen, removed psilocybin/mushroom hallucinogen from huge mushroom slice, removed space drugs from reishi, added anti-toxin to reishi and lowered the amount of sleep toxin in reishi. 2013-11-28 00:15:56 -06:00
Malkevin
bfe85205a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into tunic 
Conflicts:
	html/changelog.html
 2013-11-27 23:52:09 +00:00
Giacomand
2e5d4c4fcc Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak 
Resolved Conflicts:
	html/changelog.html
 2013-11-27 15:58:42 +00:00
KazeEspada
292430557a Makes the clusterbang launcher unlimited use. Reduces the number of projectiles per reload by half, doubles reload energy cost, and raises the cooldown from 60 to 90. Changes the name to something more humorous from SOP-6 to SOB-3. Raised to mineral cost to that more like the HONK blast. 
Only noticeable "bug":the ammo count won't update till the cooldown is over. Also, prevents rearming during the cooldown though.
 2013-11-26 18:25:38 -07:00
Aranclanos
3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2013-11-26 22:03:26 -03:00
Giacomand
d478f55673 Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak 
Resolved Conflicts:
	html/changelog.html
 2013-11-26 20:18:50 +00:00
Giacom
a468abd766 Merge pull request #1812 from LaharlMontogmmery/Unanchored-AI 
AI can now anchor/unanchor itself. Goes with Malf AI pinpointer tracking once it activates Delta for balance reasons. Please review/merge if satisfying enough.
 2013-11-26 12:15:47 -08:00
Giacom
6757f8d248 Merge pull request #1878 from Zelacks/remove_original_atom 
Removes unused variables
 2013-11-26 12:12:27 -08:00
Giacom
0cb4d6ef3a Merge pull request #1898 from Nienhaus/Nienhaus 
AI Statues Display fix Hal and Sal + "Dorfy"
 2013-11-26 12:10:16 -08:00
Giacom
7070715b57 Merge pull request #1861 from Aranclanos/NinjaForcesay 
Stop hitting yourself ninja
 2013-11-26 12:00:52 -08:00
Giacomand
61a7049cd7 Viruses are less random and you can determine the level of symptom you would get. Virus food will generate low level symptoms, Mutagen will generate medium level symptoms and Liquid Plasma will generate high level symptoms. 
Virologist starts with a small bottle of liquid plasma.
Filled in the gaps between the chem master with RGBA(255, 255, 255, 1) so you do not accidentally click on the floor anymore.
ChemMasters now has the green light overlay, which is only used by Pandemics but it looks better than red.
 2013-11-26 19:33:39 +00:00
Giacomand
67e4e04da2 Adds a stat check for AI vocal announcements. Fixes #1908 
Moves some other checks under input, as they could change after input is done.
 2013-11-26 17:40:41 +00:00
Aranclanos
055f7246c5 Sparks won't be spawned in a null location if the holodeck changes the target before their time to spawn. This will stop some runtimes. 
Shotguns won't runtime when pumped.
 2013-11-26 10:25:43 -03:00
Giacom
8235d519c8 Merge pull request #1852 from Aranclanos/HurrayMoreShitToMovementCode 
Adding bullshit to movement code.
 2013-11-26 00:34:13 -08:00
YotaXP
d6b3b3a8bd Removes the redundant server side validation that restricted cyborg access to APCs. 
Fixes the graphical bug that occurs when an AI mouses over the interface lock buttons.

Removes some remnants of the previous UI implementation.
 2013-11-25 20:37:37 -05:00
Nienhaus
18b5e1372a AI Statues Display fix Hal and Sal + "Dorfy" 
Someone pointed out that they couldn't select it, I also noticed there
was one named "Dorfy" so I also added that. So now you select all three.
Thanks Adrinus
 2013-11-25 02:53:45 -06:00
Giacomand
7d52fe8875 * Modified the disposals room to have a crusher and a stacking machine. It will allow the crew to recycle trash items. 
* Made conveyor belts invertable, to allow you to use corner pieces that are only intended for going backwards or forwards.
 * Added a new variable for disposal outlets which let you change their throw range. Default is 2 now.
 * The crusher can now be used by a screwdriver to de-emag it.
 2013-11-24 17:54:58 +00:00
Malkevin
20964837d1 Forgot to add the flask to the tunic 2013-11-24 17:34:05 +00:00
Malkevin
c3ab6146b2 Expanded the suit storage for the Captain's Tunic 
Made the suit storage on the Captain's Tunic more useful than just a place to store your e-o2 tank.

You can now store the nuke disk, stamps, medal box, flashes and melee weapons (mainly intended for the Chain of Command), and of course - smoking paraphernalia
 2013-11-24 17:25:25 +00:00
Robson Richards
75ff8338b8 Fixes bible spam 
Fixes "r_arm" nonsense
Fixes appendicitis carrying over to robotic chest
 2013-11-24 15:24:55 +00:00
Zelacks
c3e8fceefe Removes several more unused variables 2013-11-24 05:11:15 +08:00
Cheridan
f50cd2e62f Merge pull request #1849 from Ikarrus/freq 
Tweak to Spec Ops Officer radio
 2013-11-23 11:27:52 -08:00
Cheridan
865fad0d0b Merge pull request #1841 from Giacom/sound_pro 
Fixes certain objects not using 3D sounds.
 2013-11-23 10:33:03 -08:00
Aranclanos
fe936e64a0 Fixed a runtime regarding stunning yourself with items that delete themselves once dropped. Hello ninja swords. 2013-11-22 15:37:35 -03:00
Aranclanos
e162235922 Meh. 
Added some checks to see if the mob that you just pulled to a location still exists once it finished their step()
 2013-11-22 03:37:26 -03:00
ikarrus
79629fad0c Sets frequency of spec ops officer radios to 144.1 so they can communicate with deathsquads, who are also set to that frequency. 
Mostly for my own conveneience.
 2013-11-21 20:13:42 -07:00
Aranclanos
089dba4390 Clientless aliens won't runtime anymore when they change their plasma levels. 2013-11-21 22:47:50 -03:00
Giacomand
17fd5d6cdc * Fixes certain objects not using 3D sounds. 
* Gave the piano a bigger falloff.
 * Capped the sound x/z to 7.
 2013-11-21 23:50:53 +00:00
Giacom
5322a6cb62 Merge pull request #1810 from Rockdtben/APCServerSideValidation 
APC Serverside Validation
 2013-11-21 11:51:15 -08:00