cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,307 Commits 61 Branches 14 Tags
38beaaf75cf4eecbafb4e8d5cd7d6e0c5c1049ab
Commit Graph

1790 Commits

Author SHA1 Message Date
Firecage
38beaaf75c Updates 2014-09-02 01:24:54 +02:00
Firecage
7eddda88d0 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into mineralfloors 2014-09-01 23:53:41 +02:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints 
Fingerprints for Cables and Tables
 2014-08-31 17:11:14 +01:00
Firecage
834f9a05b9 Mineral flooring 2014-08-31 17:12:17 +02:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
Miauw
bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Miauw
e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02:00
Alex
d0a1eae3f9 Merge pull request #4517 from Firecage/fixchamproj 
This fixes the chameleon projector.
 2014-08-24 13:02:50 +01:00
Alex
944966ba93 Merge pull request #4520 from Firecage/Messagefixes 
This fixes the message issues
 2014-08-24 12:59:52 +01:00
Miauw
f704c320d7 More saycode bugfixing, adds a saycode readme, etc. 2014-08-23 16:21:02 +02:00
Cheridan
b33320e6b6 Merge pull request #4514 from Firecage/fix1 
Fix for 1 use freedom implant
 2014-08-22 09:52:34 -05:00
Cheridan
a7c0ca8dfd Merge pull request #4506 from Jordie0608/itsawondernanotrasendoesntreplaceweldingfuelwithsomethinglessvolatile 
Makes welderbombs use fueltank's ex_act
 2014-08-21 22:14:13 -05:00
Firecage
4198e61af1 This fixes the message issues 2014-08-22 01:15:13 +02:00
Firecage
9df78f3681 This fixes the chameleon projector. 2014-08-21 17:02:13 +02:00
Firecage
f5c3d0b9cf Fix for 1 use freedom implant 2014-08-21 16:11:26 +02:00
Jordie0608
f17200bc7f Makes welderbombs use fueltank's ex_act 2014-08-21 00:56:17 +10:00
Alex
99fae13391 Merge pull request #4393 from paprka/emptyclick 
Empty gun click noise
 2014-08-19 10:36:06 +01:00
Miauw
5765a2e2cb Resolves many, more saycode bugs. AI tracking is still broken. 2014-08-18 18:51:07 +02:00
Miauw
433262e5e0 Removes debug messages. 2014-08-17 12:58:03 +02:00
Miauw
1fef6effc3 RADIO CODE WORKS NOW HOLY SHIT 
(warning, contains tons of debug messages that still need removal)
 2014-08-16 20:33:50 +02:00
MrPerson
09071b88d5 Merge pull request #4357 from paprka/nerfninja 
Makes ninja less stupidly broken (balancing)
 2014-08-16 04:13:49 -07:00
ikarrus
cb27ad34a6 Cutting cables, too 2014-08-15 19:50:09 -06:00
ikarrus
3fe03bbea7 Constructing Tables will add fingerprints 2014-08-15 19:40:04 -06:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves 
Adds fingerless gloves, other glove related changes
 2014-08-15 08:03:37 +01:00
paprka
bbf90b10d3 span fixes 2014-08-12 02:15:07 -07:00
Alex
ff25503b4d Merge pull request #4384 from Ikarrus/deputybands 
[MAP] Boxstation Update and Deputy Armbands
 2014-08-12 08:12:15 +01:00
paprka
e97f21a24a empty weapon click 2014-08-11 22:56:05 -07:00
Alex
9cfb19f511 Merge pull request #4373 from paprka/deepgunlore 
Whole bunch of gun-related stuff
 2014-08-11 16:25:05 +01:00
Alex
53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets 
Bowman radio headsets
 2014-08-11 14:13:26 +01:00
paprka
e3c26bfdd1 Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore 
Conflicts:
	code/game/objects/items/weapons/storage/uplink_kits.dm
 2014-08-09 16:19:33 -07:00
ikarrus
8a5d1325d1 Update boxes.dm 2014-08-09 14:23:37 -06:00
ikarrus
22e0081cf3 Resolved Conflicts: 
code/game/objects/items/weapons/storage/boxes.dm
 2014-08-09 14:19:43 -06:00
ikarrus
3c96428603 [MAP] Boxstation Update and Deputy Armbands 
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
 2014-08-09 14:11:04 -06:00
Miauw
fa4d21980a Makes the new code test-ready. 2014-08-08 18:19:11 +02:00
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
Firecage
24b18fad93 Absolute paths for item files. 2014-08-07 23:02:43 +02:00
paprka
e901f9b6c1 bowmans 2014-08-07 12:30:14 -07:00
Miauw
8602795aec FUCKING RADIO CODE 2014-08-07 18:11:53 +02:00
paprka
3b00fa9cfa cargonia strong! 2014-08-07 05:51:27 -07:00
paprka
c09d8981fe makes ninja less stupidly broken 2014-08-06 15:13:06 -07:00
Miauw
6b42d39228 does more shit 2014-08-05 19:17:21 +02:00
Miauw
5ae8b76ab6 Converts whispers to the new system 
Removes say_understand()
Removes .bak files that were just ancient duplicates.
 2014-08-05 17:49:03 +02:00
Miauw
891546aa56 More work on saycode. 2014-08-05 16:02:21 +02:00
Miauw
0a4751a067 Starts work on say() improvement. 
Removes silicon/decoy AIs because they are unused and in the way.
DOES NOT COMPILE, I MAY HAVE MISSED A PAREM SOMEWHERE BUT I HAVE NO IDEA WHERE
 2014-08-04 22:30:26 +02:00
MrPerson
5b0aba0e67 Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014 
Another lowercasing pass on a bunch of items and furnitures.
 2014-08-02 18:02:50 -07:00
Cheridan
c74601646a Merge pull request #4287 from AndroidSFV/taperecorderfix 
Fixes a minor span class in tape recorder
 2014-07-31 22:28:27 -05:00
KyrahAbattoir
1b2c95a81c Merge branch 'master' into ItemNameFixing07-2014 2014-07-31 18:54:38 +02:00
Alex
589d38660a Merge pull request #3967 from CollenN/radscanner 
Adds Radioactive Microlaser to Traitor Arsenal
 2014-07-30 10:13:10 +01:00
AndroidSFV
99e7957db0 Fixes a minor span class in tape recorder 2014-07-29 14:59:51 -05:00