cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,312 Commits 61 Branches 14 Tags
8286e70c20024d92d97c51bc34eef8b95d427310
Commit Graph

2869 Commits

Author SHA1 Message Date
quiltyquilty
8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
quiltyquilty
4c079bf65b more epic fixing 2014-09-02 17:26:39 -05: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
15c6e99801 Merge pull request #4607 from Ikarrus/removelobbymeta 
Only Admins can see Ready Players in Lobby
 2014-08-31 12:29:16 +01:00
Alex
14b03b5db5 Merge pull request #4569 from quiltyquilty/hairs 
organizes various hairstyles
 2014-08-30 20:01:55 +01: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
Miauw
98d567dde7 more say bugfixes 2014-08-29 14:40:51 +02: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
Miauw
bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02: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
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
quiltyquilty
b575eb93bf organizes various hairstyles 
this organizes several of the 25 hairstyles goof added. additionally, it changes the names of Bun Head and Twin Buns to Bun Head 1 and Bun Head 2. the Ramona haircut (that i made, so it's ok :)) has been modified because it did not fully work in game, and its name has been changed to Pixie Cut to avoid the spvtw reference.
 2014-08-25 06:51:41 -05:00
Miauw
e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02:00
Alex
10cfc1d4bc Merge pull request #4445 from Incoming5643/meetthemeat 
Adds unique meat types for throwing mutant races in the gibber
 2014-08-24 13:04:10 +01:00
Alex
80251c2bf2 Merge pull request #4529 from Firecage/ZombieIan 
This fixes Zombified Ian
 2014-08-24 13:01:54 +01:00
Alex
1cf20bb083 Merge pull request #4519 from Firecage/simpleanimalattacktextfix 
Fix for simple animal attack text on humans.
 2014-08-24 13:01:33 +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
Tokiko1
e62e541860 Adds two new hairstyles, both variations of the himecut. 2014-08-23 11:47:41 +02:00
Swag McYolosteinen
1a30c9c147 Merge pull request #4522 from ChuckTheSheep/Search-Fix 
SearchFix - Fixes #4497
 2014-08-22 20:02:27 +02:00
Firecage
6eacb45fc5 This fixes Zombified Ian 2014-08-22 15:54:56 +02:00
ChuckTheSheep
747e35c1c8 SearchFix - Fixes #4497 2014-08-21 20:47:58 -04:00
Firecage
4198e61af1 This fixes the message issues 2014-08-22 01:15:13 +02:00
Firecage
d0fb8fcfc2 Fix for simple animal attack text on humans. 2014-08-22 00:34:52 +02:00
Swag McYolosteinen
99913b926a Merge pull request #4476 from Iamgoofball/hair 
Adds 25 new hairstyles.
 2014-08-21 09:47:42 +02:00
Alex
eff867c5f0 Merge pull request #4474 from Cheridan/slime_fix 
Fixes infinite slime nutrition exploit
 2014-08-20 19:35:46 +01:00
iamgoofball
6fc3974228 fixes 2014-08-19 15:58:13 -07:00
iamgoofball
013cf24842 we can now translate the hairstyle names without being a doritos munching mtn dew chugging 4chan pass owner 2014-08-19 15:43:05 -07:00
Alex
196f861efb Merge pull request #4441 from Ikarrus/brigtimer_notice 
Brig cells and Labor Shuttle will notify SecHUDs on release of a prisoner
 2014-08-19 10:32:50 +01:00
Alex
c8bd6af8bf Merge pull request #4480 from Incoming5643/statuefix 
fixes #4479
 2014-08-19 10:20:56 +01:00
Miauw
5765a2e2cb Resolves many, more saycode bugs. AI tracking is still broken. 2014-08-18 18:51:07 +02:00
Incoming
68bcb4dbbd fixes #4479 2014-08-17 23:55:26 -04:00
iamgoofball
5711f4a917 fixes 2014-08-17 14:37:30 -07:00
iamgoofball
eb66b49b70 Adds 25 new hairstyles. 2014-08-17 14:13:42 -07:00
Cheridan
ca087cb59e Fixes infinite slime nutrition exploit 
Cleans up a disgusting if else pyramid.
Fixes an issue where the upper limit on nutrition did nothing at all.

I'm very upset at whoever added the feature to eat simple_animals.
 2014-08-17 00:16:53 -05:00
Firecage
6d4f296331 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into mobabsolutes 2014-08-17 02:56:45 +02:00
Firecage
35af394b9a Absolute paths for files in the mob folder 2014-08-17 02:45:35 +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
Alex
14749abdf9 Merge pull request #4397 from Jordie0608/ogdensnutgoneflake 
Spanifies aliens
 2014-08-16 14:05:09 +01:00
Alex
ec926db19d Merge pull request #4408 from Aranclanos/canusetopicelectricboooogalo 
canUseTopic() strip panel, take 2.
 2014-08-16 13:39:12 +01:00
Alex
fdceca4c72 Merge pull request #4415 from Aranclanos/spinninnnnng 
Disguised crash fix
 2014-08-16 13:38:40 +01:00
Cheridan
4030165734 Merge pull request #4074 from AndroidSFV/aiphotoext2take2 
AI Photography Extention 2 (The Redux)
 2014-08-15 19:32:17 -05:00
Incoming
139170e926 Adds unique meat types for throwing mutant races in the gibber 
They can still be used in any recipe human meat/meat will do for
Eating fly/slime meat isn't a good idea
Recipes for mutant meats could come later

File this under "stuff I wanted to do a year ago but couldn't because mutantraces were so trash but now its not so why the fuck not"
 2014-08-15 12:32:54 -04:00
ikarrus
ef6ca38348 Brig cell timers notify SecHUDs when the timer has expired 
Helps Wardens keep track of prisoners and hopefully reduces re-arrests of released prisoners

It's all in a new proc, broadcast_hud_message() which handles securitron arrest declarations as well.
 2014-08-14 22:34:33 -06:00