cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,532 Commits 61 Branches 14 Tags
b1eb7900334ecd620ebbc996b50cee4bc68fa0e6
Commit Graph

5845 Commits

Author SHA1 Message Date
JJRcop
b1eb790033 Adds button when pulling something 
Fixes drone laws indentation
 2014-09-14 23:40:17 -04:00
Remie Richards
78cb2636b9 u saw nothing 2014-09-14 22:31:36 +01:00
Remie Richards
da50538b60 Drones can now speak to other drones, Drones can now be worn as hats. 2014-09-14 12:18:09 +01:00
JJRcop
66a60dfae0 Fixes a bug with clicking on an empty storage with an empty hand causing the chat to be spammed. 
Removed visible_messages when taking anything out of internal_storage, as with regular storage items.
 2014-09-14 05:43:49 -04:00
JJRcop
f9a0fe6b2f Makes the drone internal storage much more user-friendly 2014-09-14 04:57:30 -04:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Cheridan
304b89bdc0 Merge pull request #4776 from Miauw62/radiodeaf 
Fixes "seeing" people speak over the radio while deaf.
 2014-09-11 08:42:18 -05:00
Cheridan
b0ab0754e1 Merge pull request #4772 from Aranclanos/carpmeat 
Fixes a bug where you couldn't get meat from carps and several other mobs.
 2014-09-11 08:21:36 -05:00
Hornygranny
1bc6c36593 fixed typo 2014-09-11 01:55:07 -07:00
Miauw
e557cbb263 Fixes "seeing" people speak over the radio while deaf. Fixed #4768 2014-09-10 14:19:42 +02:00
Cheridan
88471ff0d6 Merge pull request #4622 from Ikarrus/hivemindpaygate 
Hivemind Communication (:g) must be purchased before use
 2014-09-10 07:09:55 -05:00
Cheridan
81611c8f1a Merge pull request #4723 from Miauw62/now_recording_input 
Prevents voice analyzers using their own speech as input.
 2014-09-10 07:08:05 -05:00
Cheridan
9550d3e844 Merge pull request #4729 from Miauw62/corgemotes 
Makes simple_animals able to emote again
 2014-09-10 07:06:39 -05:00
Aranclanos
de35b75fad Fixes a bug where you couldn't get meat from carps and several other mobs. 2014-09-10 07:30:31 -03:00
Cheridan
6c5f0fe355 Merge pull request #4744 from Ikarrus/lizardthugs 
ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
 2014-09-09 17:30:39 -05:00
Cheridan
0a35c2c740 Merge pull request #4749 from phil235/VomitMsgFix 
Vomit message fix
 2014-09-09 17:18:07 -05:00
phil235
a4de7ac6a1 Vomit message fix 2014-09-08 22:39:07 +02:00
Hornygranny
89850cfd2b fixed fucked spacing from resolver 2014-09-07 21:39:10 -07:00
ikarrus
399d2844e5 ENFORCE_HUMAN_AUTHORITY now only applies to Command positions 
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
 2014-09-07 22:33:56 -06:00
Hornygranny
02e527e938 Merge branch 'smoothaliens' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
 2014-09-07 21:33:48 -07:00
Hornygranny
2fac982191 alien nightvision moved to carbon/alien 
random lines fixed
 2014-09-07 21:16:32 -07:00
Orange Borg
0e05203e1a Don't tell GIA 
2fast goofball
 2014-09-08 15:55:04 +12:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents 
Magic Mania $1.75: Summon events
 2014-09-07 22:34:26 -05:00
Cheridan
7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All 
Silicon Medical and Security HUDs!
 2014-09-07 20:01:12 -05:00
Cheridan
866dbb7959 Merge pull request #4634 from Carn/timSort 
TimSort for byond
 2014-09-07 19:52:02 -05:00
ikarrus
0e27dc6b39 Resolved Conflicts: 
code/modules/mob/living/say.dm
 2014-09-07 10:58:13 -06:00
Miauw
877bd04fa1 Makes simple_animals able to emote again??? Fixed #4669 2014-09-07 17:46:02 +02:00
Cheridan
6bde58d70d Merge pull request #4702 from Miauw62/sleepen 
Balance changes to the sleepy pen.
 2014-09-07 10:38:00 -05:00
Alex
8f81a0e766 Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff 
Removed unnecessary messages when welding
 2014-09-07 15:08:01 +01:00
Alex
b7aad470a0 Merge pull request #4705 from Ikarrus/humanmasterrace 
Config Option to Bar Lizards from Authority Roles
 2014-09-07 15:02:45 +01:00
Miauw
cfe2f63b19 Prevents voice analyzers using their own speech as input. Fixed #4670 2014-09-07 13:45:04 +02:00
ikarrus
4230894dec Merge branch 'master' of https://github.com/tgstation/-tg-station into hivemindpaygate 
Resolved Conflicts:
	code/modules/mob/living/say.dm
 2014-09-06 12:59:08 -06:00
Alex
574d5248d4 Merge pull request #4600 from Menshin/2Spooky5Playing 
Fixes skeletons unable to play xylophone on their ribcage
 2014-09-06 19:13:50 +01:00
Alex
9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup 
Nuke Ops Update
 2014-09-06 19:10:38 +01:00
Alex
c854ef6667 Merge pull request #4703 from Ikarrus/beepboopiamthelaw 
Securitrons will only arrest unidentifiable persons when ID check is on
 2014-09-06 19:10:07 +01:00
Alex
8fff1aa0c7 Merge pull request #4701 from phil235/goldschlagerfix 
fixing the icon of goldschlager glass
 2014-09-06 19:08:02 +01:00
Alex
5e367a0e37 Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos 
Logging to add/remove memo
 2014-09-06 19:07:54 +01:00
Alex
f2fa83c05b Merge pull request #4675 from Aranclanos/ninjamask 
Removes ninja mask modes.
 2014-09-06 19:07:01 +01:00
Alex
368b8b199b Merge pull request #4682 from Menshin/reagents_consumption_fix 
Fixes reagents extra consumption + some cleanup
 2014-09-06 19:05:42 +01:00
Alex
62a7596270 Merge pull request #4686 from Miauw62/idfix 
Worn ID won't display on station-bounced broadcasts.
 2014-09-06 19:04:59 +01:00
Alex
53e7981a98 Merge pull request #4698 from Ikarrus/roundendreportbugs 
Fixes Round-End report bugs
 2014-09-06 19:04:27 +01:00
Swag McYolosteinen
209aa859aa Merge pull request #4593 from Firecage/orangeshoescuffs 
No longer can you make shoecuffs with cable cuffs
 2014-09-06 12:16:38 +02:00
Swag McYolosteinen
6fc761ab49 Merge pull request #4401 from Lo6a4evskiy/Multiple_holograms 
Multiple AIs can use single holopad
 2014-09-06 11:51:26 +02:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
ikarrus
bae6578055 Config Option to Bar Lizards from Authority Roles 
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
 2014-09-05 22:44:05 -06:00
ikarrus
4ace65b90e Securitrons will only arrest unidentifiable persons when ID check is on 
- Sec bots will check if the person is "Unknown" and without an ID if idcheck is on. This means beepsky will stop targetting people at the HoP line, or officers changing his settings. It's meant to target disguised people, as I had originally intended.
- However, sec bots, unable to identify monkeys, will start arresting them if idcheck is on
- Agent IDs buffed to reduce threat level by 5 instead of 2
 2014-09-05 20:40:09 -06:00
Cheridan
fa26fc1e4f Merge pull request #4685 from Firecage/Spanclassstuff 
Spanclass fixes
 2014-09-05 13:07:53 -05:00
Miauw
12d3492426 unticked files are the bane of my existance. 2014-09-05 19:44:41 +02:00
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Lo6a4evskiy
1139e700a8 Cleanup 2014-09-05 18:32:02 +04:00