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

5760 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
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
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
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
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
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
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
ikarrus
53dd04466f Golems created by runes also get the same treatment 2014-08-31 17:51:39 -06:00
ikarrus
759ca4979c Clones and Podmen will no longer be created with underwear already on. 2014-08-31 16:49:36 -06: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
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
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
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
15c6e99801 Merge pull request #4607 from Ikarrus/removelobbymeta 
Only Admins can see Ready Players in Lobby
 2014-08-31 12:29:16 +01:00
Cheridan
9a335b7855 Merge pull request #4549 from Ikarrus/tinyprickironicsmiley 
Adds a couple of new hallucination effects :^)
 2014-08-30 16:51:09 -05:00
Cheridan
f209d4ba52 Merge pull request #4601 from Ikarrus/removeholidaycheer 
Holiday Events no longer fire false alarms
 2014-08-30 16:41:23 -05:00
Alex
679e0bda52 Merge pull request #4524 from Ikarrus/eventsprompter 
Trigger Events verb will now ask if the admin wants to announce to the crew
 2014-08-30 20:12:46 +01:00
Alex
ed0305cf6b Merge pull request #4589 from Menshin/wand_fix 
Fix wands losing a charge even when no spell was actually cast
 2014-08-30 20:03:03 +01:00
Alex
14b03b5db5 Merge pull request #4569 from quiltyquilty/hairs 
organizes various hairstyles
 2014-08-30 20:01:55 +01:00
ikarrus
2f65498aa7 Minor grammar correction for Centcom report names 2014-08-30 11:18:19 -06:00
ikarrus
6d79ac49d1 Only Admins can see Ready Players in Lobby 
Removes a lot of potential metagaming by stopping players from counting or remembering who readied up during the lobby.
 2014-08-29 21:49:44 -06:00
ikarrus
a49f4e77ae Holiday events will stop failing False Alarm events. 2014-08-29 09:15:23 -06:00
Miauw
98d567dde7 more say bugfixes 2014-08-29 14:40:51 +02:00
ikarrus
291f0f5716 Holiday Events no longer fire false alarms 
Fixes #4597
Also fixes wierd identation
 2014-08-28 23:05:14 -06:00
ikarrus
a8732d4219 One more holiday event to label 2014-08-28 22:58:57 -06:00
ikarrus
723f1c46b0 Matches the real messages a little better 2014-08-28 22:27:06 -06:00
ikarrus
1cfdde31f3 -Trigger Event is now its own panel 
-The prompt to alert the crew now includes a cancel button
-Holiday Events are now marked more clearly in the menu
 2014-08-28 22:08:14 -06:00
Miauw
3c0afa4e0a Fixes another holopad bug. 2014-08-28 13:34:54 +02:00
quiltyquilty
b344431648 enforces consistency 2014-08-27 18:08:08 -05:00
quiltyquilty
0739769acb does what giacom told me to do 
renames some hairs
adds a few more that snapwalk made
 2014-08-27 17:46:47 -05:00
Menshin
0f3b711629 Tidying presentation 2014-08-27 21:07:52 +02:00
Menshin
bdca196312 Fix wands losing a charge even when no shot was actually fired (#4588). 2014-08-27 19:54:46 +02:00
Miauw
bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
Cheridan
96cf5cdedd Merge pull request #4574 from Ikarrus/commscooldown 
Console Cooldown Tweaks
 2014-08-27 10:16:00 -05:00
Cheridan
0198ec2bde Merge pull request #4576 from Firecage/SPANCLASSES 
SPANCLASSES!!!!!
 2014-08-26 15:05:12 -05:00
Swag McYolosteinen
93e5918abc Merge pull request #4381 from Ikarrus/burglaralarm 
Burglar Alarm for Captain's Display Case
 2014-08-26 19:36:04 +02:00
ikarrus
828d1627a3 code optimization 2014-08-26 10:51:20 -06:00