cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-06 15:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,293 Commits 60 Branches 14 Tags
67e37bd449bc70617a4e72aeb33da589542e9a4a
Commit Graph

7435 Commits

Author SHA1 Message Date
Miauw
67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm
 2014-01-07 18:18:59 +01:00
Cheridan
0665ff4125 Merge pull request #2264 from Giacom/disposal_outlet_runtimefix 
Fixes the disposal outlet runtiming.
 2014-01-07 08:42:21 -08:00
Cheridan
afd6b5fa22 Merge pull request #2266 from fleure/janradio 
Gives janitor service headset
 2014-01-07 08:37:24 -08:00
Cheridan
0102191bbc Merge pull request #2247 from Giacom/blinkyoself 
Changed blink to only spawn a single static smoke cloud.
 2014-01-07 08:28:06 -08:00
Cheridan
1a58a3cf86 Merge pull request #2265 from fleure/watertank 
Reduced watertank slowdown slightly
 2014-01-07 08:16:10 -08:00
Cheridan
34fad5272b Merge pull request #2262 from Razharas/NoIReallyCant 
Fixes cloning not working properly
 2014-01-07 07:44:44 -08:00
Giacom
7cb6fcb5dc Merge pull request #2243 from Cheridan/Ninja 
Ninja Death Tweak
 2014-01-07 06:34:35 -08:00
Giacom
9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls 
Half of the runtimes of four days here
 2014-01-07 06:24:57 -08:00
Giacom
dbfb8ca052 Merge pull request #2254 from Razharas/Text2PathFix 
Fix of mech fabricator
 2014-01-07 06:24:12 -08:00
Cheridan
fbeeae0a4c Merge pull request #2230 from Intigracy/Redbuttonisshittysoisdoubleagent 
Big red button / syndicate bomb changes
 2014-01-06 18:23:07 -08:00
Cheridan
58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables 
Poker tables
 2014-01-06 14:35:03 -08:00
Cheridan
cf0d70c767 Merge pull request #2237 from Jordie0608/ispentareallylongtimeonthis 
Fixed justicebot
 2014-01-06 14:12:26 -08:00
Cheridan
9bff546dad Merge pull request #2245 from Nienhaus/master 
Side Part hair
 2014-01-06 13:48:35 -08:00
Cheridan
49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS 
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
 2014-01-06 13:40:04 -08:00
Giacom
a219896082 Merge pull request #2241 from ChuckTheSheep/explosiveoptimization 
Explosion Optimizations
 2014-01-06 13:07:05 -08:00
Fleure
c50255107a Gives janitor service headset 2014-01-06 18:51:22 +00:00
Fleure
333d0ed045 Reduced watertank slowdown slightly 2014-01-06 18:26:06 +00:00
Giacomand
f0a8e2bc76 Fixes the disposal outlet runtiming. The removed code, which was causing the runtime, wasn't even doing anything and was just setting "throwing" to 2 for no reason. 2014-01-06 18:20:59 +00:00
Razharas
2d4c909cf2 Fixes cloning not working properly 
How did this even happen i dont know
 2014-01-06 21:39:32 +04:00
Aranclanos
233a5b3b9b Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs. 2014-01-06 06:34:17 -03:00
Razharas
0725b8ccef Fix of mech fabricator 
Fixes #2248
Fucking text paths are poisoning my contributions
Thanks Obama
 2014-01-06 09:17:30 +04:00
Cheridan
26d3d03d69 Merge pull request #1906 from Aranclanos/GiaPlsFix 
Removed the need of input and output objects for the mining machinery
 2014-01-05 14:23:28 -08:00
Giacomand
3fbeebfb6e Changed blink to only spawn a single static smoke cloud. 
Fixed blink not triggering the AI turrets.
 2014-01-05 20:41:06 +00:00
Giacom
3c84e37160 Merge pull request #2235 from AndroidSFV/fix2221 
Resolves #2221
 2014-01-05 06:52:47 -08:00
Nienhaus
9e798d1890 Side Part hair 
Someone requested side parted hair so I did it.
Image: http://puu.sh/6apZJ.png
 2014-01-05 08:34:24 -06:00
Cheridan
bf9fa21ddc Merge pull request #2149 from Miauw62/kittens 
Kittens!!!! !!! !! !! !!!!!! !
 2014-01-04 20:21:15 -08:00
Cheridan
e71314d4eb Merge pull request #2199 from Perakp/buckleFix 
Buckle fix
 2014-01-04 19:51:59 -08:00
Cheridan
db67b90968 Merge pull request #2218 from Incoming5643/bombrefactor 
Refactors syndicate bombs to remove the var degutted
 2014-01-04 19:44:25 -08:00
Cheridan
261615a0bc Ninja Death Tweak 
THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES

NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY

YES I'M MAD
 2014-01-04 19:26:05 -06:00
ChuckTheSheep
b3635a2935 small fixes 2014-01-04 20:03:22 -05:00
ChuckTheSheep
e71f98bbb8 Explosion Optimizations 
Implements a trange that internally checks only turfs and thus less
intensive.
 2014-01-04 19:29:17 -05:00
Intigracy
0cbe8dde9e Makes it so that the button is only in nuke-ops, and the bombs are NOT in double agent. 2014-01-04 12:01:13 -08:00
Jordie0608
efc9b25083 Fixed justicebot 2014-01-05 04:24:22 +11:00
AndroidSFV
fe6f217d6f Adds logging to emagged borgs using their stun arm. 2014-01-04 04:00:16 -06:00
Intigracy
6426e00bc5 Makes the big red button only spawnable by nuke ops. 
Fuck having rounds ruined in the first 30 seconds by people throwing a bomb at genetics and pushing the button, and then spamming it since, due to it being Double Agent, every other agent is also buying bombs.
 2014-01-03 18:41:25 -08:00
Incoming
50838d701d Adds attack logging to learning spells from one time use spellbooks and casting of spells. 2014-01-03 17:40:32 -05:00
Cheridan
5426868c53 Merge pull request #2178 from errorage/2013_12_29_scalable_ui 
Adds framework for multiple UI styles for humans, with a no-UI mode being the first example. Also makes all mobs' UIs scalable.
 2014-01-03 14:23:08 -08:00
Giacom
12f13456ae Merge pull request #2207 from Cluwnes/tcomrades 
Added ckey + real_name logging to server logs for "NTLS"
 2014-01-03 13:57:03 -08:00
Miauw
61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
 2014-01-03 19:27:51 +01:00
Razharas
80b592d0b3 Resolving conflicts 
God hates git
And so do i
 2014-01-03 21:12:14 +04:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame 
Removes the gag ball.
 2014-01-03 04:19:29 -08:00
Aranclanos
b5fc39236f changes strings to paths on the mining machinery code 2014-01-03 03:23:28 -03:00
Incoming
58800659de The prequeisite Gia related code beautification pull 2014-01-02 15:00:29 -05:00
Giacom
09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours 
Adds new radio frequency colours
 2014-01-02 10:41:09 -08:00
Giacom
0cd059432e Merge pull request #2135 from ChuckTheSheep/patch-2 
Fixed an oversight in Wizard-Spell targeting code
 2014-01-02 10:33:27 -08:00
Giacom
b2e53335f0 Merge pull request #2167 from rymd/text-fix 
Fixed destructive analyzer failure messages
 2014-01-02 10:32:32 -08:00
Giacom
6e5e5efb5b Merge pull request #2184 from Cluwnes/invisimessages 
Adds ckey logging to PDA message sending
 2014-01-02 10:32:01 -08:00
Giacom
70a4d8e9af Merge pull request #2192 from Cheridan/iDidThisByHand 
Obsoletes flags = FPRINT | TABLEPASS*
 2014-01-02 10:31:46 -08:00
Giacom
c56cc9c89f Merge pull request #2122 from Miauw62/disposalsfix 
Disposals will no longer create invisible floor tiles.
 2014-01-02 10:30:12 -08:00
Incoming
de972e3b02 Refactors syndicate bombs to remove the var degutted. 
The bombs themselves no longer explode, the payloads (which now actually exist in the bombs) do.

This means that you can play cruel jokes on people by activating bombs with removed payloads or easily code in other kinds of payloads (there'll be a future pull with a few from me at the very least) and not have to touch the bomb code itself.
 2014-01-02 12:20:05 -05:00