cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,418 Commits 61 Branches 14 Tags
2cf129759be42ff8e69de07dfd73d9b1ef515f15
Commit Graph

5788 Commits

Author SHA1 Message Date
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
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
Lo6a4evskiy
1139e700a8 Cleanup 2014-09-05 18:32:02 +04:00
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
phil235
d3a6a793ee fixing the icon_state of goldschlager glass 2014-09-05 11:51:45 +02: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
ikarrus
c22a44d676 Fixes Round-End report bugs 
- Fixes #4664 New Players won't get the "you did not survive" message
- Shift duration minutes will never neve have more than 2 digits (Same thing has been done for the Round Duration timer in Check-Antags Menu)
 2014-09-04 21:05:07 -06: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
Firecage
cee3e7e7b7 fix3 2014-09-04 16:18:38 +02:00
Firecage
0b129fb646 fix2 2014-09-04 16:00:45 +02: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
Miauw
64c95a2fae Worn ID won't display on station-bounced broadcasts. Fixed #4650 2014-09-03 20:30:40 +02:00
Firecage
6d259e10ec Spanclass fixes 2014-09-03 20:00:35 +02:00
Menshin
6c7ff25568 *fixes reagents consuming extra units each ticks (#4608) 
*removed the inexistent reagent/plasma subtype of hellwater
*hitting someone with unholy water in body with the bible now turns the unholy water in holy water instead of space cleaner
 2014-09-03 09:47:47 +02: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
4ee758c0d8 Removes ninja mask modes (thermal, nightvision, traitor-scan and mason) and gives ninjas night vision glasses. 2014-09-02 21:28:17 -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
Jordie0608
a72b0dddad Made this actually work 2014-09-01 22:27:03 +10:00
Jordie
b3e7e25631 Logging to add/remove memo 2014-09-01 20:39:12 +10:00
ikarrus
3e4378f75f - A leader will always be chosen 
- Nuke ops will all stop spawning on the same spawn location (TC management console)
 2014-08-31 21:27:32 -06:00
ikarrus
908cac5ac0 Quick-Create Nuke Ops Actually Working 
- A nuke will actually spawn with them
- The armory closet (pinpointers, etc) will actually spawn
- Cleaned up code
 2014-08-31 19:27:41 -06: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