cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,356 Commits 61 Branches 14 Tags
eae6cdbe96cb93e2f8e6efb22c7fd2ef3a964a7f
Commit Graph

10762 Commits

Author SHA1 Message Date
Lo6a4evskiy
eae6cdbe96 The rest of the junk 2014-09-05 18:14:02 +04:00
Lo6a4evskiy
a1fe0c03a2 Merge branch 'master' into Multiple_holograms 
Conflicts:
	code/game/machinery/hologram.dm
	code/modules/mob/living/silicon/say.dm
 2014-09-05 18:07:35 +04:00
Aranclanos
c487dd350a Merge pull request #4620 from Cheridan/how_do_they_fit 
stop asking how crowbars fit in your pocket fffff
 2014-09-05 02:44:01 -03:00
Aranclanos
a4446a039b Merge pull request #4626 from Ikarrus/nudeclones 
Clones and Podmen will no longer be created with underwear already on
 2014-09-05 02:42:43 -03:00
Aranclanos
f5725d785b Merge pull request #4624 from Iamgoofball/patch-2 
Removes cult armor from the starting cultist talisman
 2014-09-05 02:32:00 -03:00
Aranclanos
28a7ba6a6d Merge pull request #4666 from Miauw62/deafspeakfix 
Fixes names of hearing while deaf
 2014-09-04 21:13:40 -03:00
Aranclanos
50d4ae6561 Merge pull request #4640 from quiltyquilty/quickfix 
a truly epic fix
 2014-09-04 19:58:16 -03:00
quiltyquilty
62d62a28cd fixes what aran told me to fix 2014-09-04 17:36:27 -05:00
Cheridan
d68a9841d9 Merge pull request #4641 from Ikarrus/MapHero 
[MAP]Boxstation Dynamic maintenance overhaul
 2014-09-04 00:44:25 -05:00
Cheridan
a38a517ea9 Merge pull request #4672 from Aranclanos/allinonegrinder 
Makes the all-in-one grinder have density 0
 2014-09-03 21:55:28 -05:00
Cheridan
66e6e006ab Merge pull request #4677 from Aranclanos/gunclicktext 
Removing the black *click* of guns
 2014-09-03 21:25:53 -05:00
Cheridan
7d26b6adae Merge pull request #4632 from optimumtact/orionfix 
Prevent ghosts seeing admin flag warnings when they click on machines
 2014-09-03 21:04:52 -05:00
quiltyquilty
ae7f0cb6fa returns glorious ponytail 2 2014-09-03 19:14:21 -05:00
quiltyquilty
8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
Aranclanos
aefa7a3795 Merge pull request #4660 from Miauw62/allgiasfault 
fixes colors and name tags
 2014-09-03 20:11:28 -03:00
Aranclanos
70d70946d1 Removed the *click* black text that all mobs get when a gun can't fire. The red *click* will still appear to the gun wielder. 2014-09-02 22:22:47 -03:00
Aranclanos
e544160e88 Makes the all-in-one grinder have density 0 2014-09-02 20:44:38 -03:00
quiltyquilty
4c079bf65b more epic fixing 2014-09-02 17:26:39 -05:00
Miauw
832b433df0 makes request consoles no longer say "title". Fixed #4652 2014-09-02 20:42:53 +02:00
Miauw
ce1637970e Makes hearing deaf people speak not show your name. 2014-09-02 20:35:31 +02:00
Miauw
6ee969ce94 Stops new_players from hearing hivemind chat. Fixed #4643 2014-09-02 20:19:43 +02:00
Miauw
f07c1acbc1 fixes colors and name tags 2014-09-02 20:02:37 +02:00
Alex
a0bf1cb7f4 Merge pull request #4621 from Ikarrus/bombsto6 
Increases Syndicate Bomb cost to 6TC
 2014-09-02 16:39:52 +01:00
ikarrus
bf5f5e5922 Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-09-01 22:58:23 -06:00
Cheridan
ed9ef3c3e3 Merge pull request #4583 from JStheguy/master 
NT Poster Port
 2014-09-01 17:49:44 -05:00
JStheguy
1d21fb5d20 Mail Order Corporate Posters 
Whoops forgot about this bit.
 2014-09-01 17:44:39 -05:00
Miauw
2c9e5b69da Fixes a radio runtime. 2014-09-01 14:14:35 +02:00
Francis Devine
a492b70f16 No visible message for observer topic check 
This avoids the user seeing a message about lacking admin flags when
they try to use machinery as a ghost
 2014-09-01 15:46:04 +12:00
ikarrus
53dd04466f Golems created by runes also get the same treatment 2014-08-31 17:51:39 -06:00
Iamgoofball
7a21fd6776 Update talisman.dm 2014-08-31 16:27:30 -07:00
ikarrus
759ca4979c Clones and Podmen will no longer be created with underwear already on. 2014-08-31 16:49:36 -06:00
Iamgoofball
1863680884 Removes armor from the starting talisman 2014-08-31 14:00:58 -07:00
Alex
4e7c2cbb8e Merge pull request #4623 from phil235/WaterLightFix 
Fix low water light on hydrotray
 2014-08-31 20:55:41 +01:00
phil235
f4c38c6b86 Fix low water light on hydrotray 
one single space...
 2014-08-31 21:53:26 +02:00
ikarrus
4cfbbd4cde Increases Syndicate Bomb cost to 6TC 
In the interest of cutting down on the same tired pair of telecoms and SMES bombings, I'd like to increase syndicate bomb costs to 6, so they can only buy one.
 2014-08-31 12:13:57 -06:00
Cheridan
da5b68e7ee stop asking how crowbars fit in your pocket fffff 2014-08-31 13:02:04 -05:00
Cheridan
e0d171e7bf Merge pull request #4483 from ChuckTheSheep/direct-intent 
Direct intent clicking (redo)
 2014-08-31 11:25:47 -05:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints 
Fingerprints for Cables and Tables
 2014-08-31 17:11:14 +01:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say() 
[READY] Saycode rewrite
 2014-08-31 10:59:04 -05:00
Miauw
dc5ba247b2 blblb 2014-08-31 15:10:32 +02:00
Miauw
6176d845f0 fixes some stuff gia told me to fix 2014-08-31 14:27:40 +02:00
Tokiko1
4ef3beb454 Testing 2014-08-31 14:25:32 +02:00
Tokiko1
ba20a875a0 Should fix merge conflicts 2014-08-31 14:22:56 +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
Alex
660a76e2a8 Merge pull request #4611 from Ikarrus/reportgrammar 
Minor grammar correction for Centcom report names
 2014-08-31 12:36:58 +01:00
Alex
c788df4d6e Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish 
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
 2014-08-31 12:34:34 +01:00
Alex
2c19d113bd Merge pull request #4580 from Firecage/changelingpanaceatext 
This fixes the description that Anatomic Panacea gives.
 2014-08-31 12:34:01 +01:00
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints 
Shower logging and prints
 2014-08-31 12:32:31 +01:00
Alex
a931f00608 Merge pull request #4563 from Ikarrus/allspecies 
Secret Button to set everyone's mutant race
 2014-08-31 12:32:02 +01:00
Alex
0cb906cc62 Merge pull request #4606 from Ikarrus/detailedendreport 
More Detailed End-Round Report
 2014-08-31 12:29:43 +01:00