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
32,735 Commits 61 Branches 14 Tags
b8e699bb180bbac03a5f077db3fa020faaf4ff47
Commit Graph

6718 Commits

Author SHA1 Message Date
Cheridan
b8e699bb18 Merge pull request #16862 from phil235/DrugginessFix 
Fixes Druggy vision disappearing immediately due to a typo.
 2016-04-14 21:25:49 -05:00
Joan Lung
7db9aa0e76 Merge pull request #16848 from KorPhaeron/butcher 
Lavaland Buterching and Suit Fixes
 2016-04-14 09:32:50 -04:00
coiax
7f328ba077 Added ORIGINAL CONTENT skeleton toys that chatter when you play with them (#16792) 
* Step one, aquire voices for skeletons

* Moved sounds to their own folder

* Added samples of up to ten phomemes long for papyrus

* Added samples of up to ten sans phomemes

* Add skeleton talking

Skeletons now produce audible sound effects representing their distinctive
speech.

* Skeletons now respect punctuation in their chatter

Except for semi-colons, due to HTML escapes of the ' character.

* Lowered volume of skeleton phomemes

* Use Dunc's regex for parsing messages

* Added sans and papyrus toy sprites

Spriting is hard. But I think I managed to crush the images down to fit
in our 32x32 box.

* Generic talking action figures

Talking action figures like the owl figure and the griffin figure are
now generic, and have a pool of messages to pick from. This allows us to
make our TOTALLY ORIGINAL skeleton toys.

* Added the toys to the prize list

No point making these if you can't get them.

* Moved skeleton vocalising code into toys

* Fixes runtimes and bugs with skeleton talk

Remaking the regex each time makes sure it gives output everytime,
and we've also put a check that the item in the list is actually
a number before calling max() that was causing a runtime previously.

* Restored original form of skeleton span picking

Remie's was better.

* More messages for skeleton toys

I think that's probably enough to satisfy me.

* Changed for loop to new style
 2016-04-14 09:30:33 -04:00
Jack Edge
52827cc7b9 Merge branch 'master' into without-the-crates 2016-04-14 08:50:14 +01:00
Joan Lung
6f636e1739 Merge pull request #16866 from LatD/Floorbot-2 
Floorbots can replace existing floor tiles with loadable custom tiles
 2016-04-13 21:04:58 -04:00
LatD
4f94f4f43b Custom tiles to floorbot 2016-04-14 03:33:44 +03:00
phil235
163ed095ba Fixes admin revujenate not removing the nearsighted/blind screen effect when it cures nearsightedness and blindness. 2016-04-14 01:54:25 +02:00
phil235
662629ecab And another typo, fixing eye_blurriness effect disappearing when it shouldn't. 2016-04-14 01:31:12 +02:00
phil235
35ee52ffa3 Fixes Druggy vision disappearing immediately due to a type. 2016-04-13 23:55:40 +02:00
Cheridan
10dc66463a Merge pull request #16837 from Incoming5643/brainmobs_are_trash_someone_remove_them 
Removes mushmouth MMIs
 2016-04-13 16:20:59 -05:00
Cheridan
9f260139bf Merge pull request #16667 from sawu-tg/master 
Minor SNPC fixes, Fixes #16572
 2016-04-13 16:11:44 -05:00
KorPhaeron
6866229d78 And removes excess diamonds 2016-04-13 00:17:59 -05:00
KorPhaeron
ca44efdca2 removes excess goliath plates 2016-04-13 00:17:10 -05:00
KorPhaeron
a372d7028d Butchering and Suit Fixes 2016-04-13 00:03:51 -05:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Incoming
31b1786fb8 Removes mushmouth MMIs 2016-04-12 18:09:25 -04:00
Joan Lung
28d543aa8b Merge pull request #16704 from Incoming5643/Its_3_am_and_I_am_too_dazed_to_make_a_clever_branch_name 
Tongues
 2016-04-11 19:44:36 -04:00
KorPhaeron
36b5122709 Merge pull request #16786 from TechnoAlchemisto/emote_fix 
Fixes a simple animal emote.
 2016-04-11 10:35:18 -05:00
Cheridan
f650cf0e0d Merge pull request #16720 from RemieRichards/client_colour_handler 
Adds a priority system for client.color effects
 2016-04-10 13:06:22 -05:00
TechnoAlchemist
a30b6a7502 fixes an emote. 2016-04-10 01:00:40 -07:00
Incoming
513d5b12dc Generalize the system down to carbon, adding a xeno tongue that handles the actual hissing sound. 
Moves the tongue organ to the mouth
Fixes up synth inheritances
Losing your tongue no longer makes you silent, but rather just makes you a lot harder to understand
Little misc things
 2016-04-09 21:55:44 -04:00
AndrewJacksonThe2nd
a075043f86 Arnold Palmer, Auto-collecting Slime Processors, and Cyborg Booping 2016-04-09 15:34:10 -07:00
Joan Lung
0af8681bb7 Merge pull request #16724 from coiax/my-best-friend-is-a-holocarp 
My best friend is a holocarp
 2016-04-09 14:19:18 -04:00
coiax
daecc5983b Revert "HERES YOUR CODE FIX SIR" 2016-04-09 19:10:26 +01:00
AnturK
86eee6605d Merge pull request #16478 from GunHog/WJ_Likes_To_Inspect_His_Xenos 
Xenomorph changes and features
 2016-04-09 12:23:20 +02:00
KazeEspada
c6eaacac78 Refactors guardian code so that the name datums do everything. Makes it so that guardians can use an overlay system. 2016-04-09 00:29:36 -07:00
KorPhaeron
05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate 
You can no longer drop survival capsules on top of dense objects
 2016-04-08 13:36:29 -05:00
Cheridan
108eefb86c Merge pull request #16705 from Shadowlight213/adminghostruntime 
Fixes a runtime with IsAdminGhost
 2016-04-08 12:39:01 -05:00
Nerd Lord
5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
Jack Edge
d8530c53f6 Added Jaws reference to assassin holocarp 2016-04-08 08:44:13 +01:00
Jack Edge
11da00d9b7 Fixed /choose not allowing you to choose 
I misunderstood its purpose. I have fixed it now.
 2016-04-08 08:38:50 +01:00
Jack Edge
6b64b5b71a Removed duplicated see invisible var 2016-04-08 08:20:16 +01:00
Jack Edge
501442cec8 Changed back to recent snare stuff 2016-04-08 08:19:24 +01:00
KorPhaeron
6d519c4e26 Merge pull request #16673 from PKPenguin321/fuck-you-goofball 
Reverts most of goof's grab nerf
 2016-04-08 02:05:21 -05:00
Nerd Lord
8caca4a78e mining mobs fire less often 2016-04-07 20:46:41 -04:00
Jack Edge
aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp 
Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm
 2016-04-07 22:56:08 +01:00
Remie Richards
984afed89f Adds a priority system for client.color effects 2016-04-07 21:55:31 +01:00
Jack Edge
21b95b4794 New and improved holocarp sprites 
Adds the greyscale holocarp to the guardian.dmi and makes our
holocarp code use it.
 2016-04-07 21:41:15 +01:00
Incoming
8ca4bd4a84 Remie catching me on real coder hours 2016-04-07 03:33:42 -04:00
Shadowlight213
9e296ed32e Fixes a runtime with IsAdminGhost 2016-04-07 00:05:29 -07:00
Incoming
b2b02887ec Tongues WIP 
Adds tongues, which serve as the physical manifestation of speech impediments.
 2016-04-07 02:59:23 -04:00
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances 
Conflicts:
	code/game/atoms.dm
 2016-04-06 21:26:46 +01:00
Kyle Spier-Swenson
91d90c602f fixes trees fucking up atmos. 2016-04-06 12:37:54 -07:00
GunHog
afbe7c0dcc Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-06 14:10:07 -05:00
AnturK
2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain 
Adds on_species_gain proc to human species
 2016-04-06 20:18:15 +02:00
Core0verload
4e9db5beac Slimes can now be put in stasis by CO2 2016-04-06 02:25:49 -06:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework 
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
 2016-04-06 02:15:25 -06:00
PKPenguin321
272c7bb896 reverts most of goof's grab nerf 2016-04-05 17:19:10 -07:00
KorPhaeron
55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff 
Simple Animal ranged cooldowns now use world.time
 2016-04-05 18:45:48 -05:00
Sawu
443aa9b4bf Minor SNPC fixes 
* Due to changes with the nearby code, NPCs no longer use nearby as a crowded check.
* Traitor targets now take priority above other things.
* Fixed chat defaulting to spouting known phrases
* Fixed a missing stat check for chat.
 2016-04-06 05:40:13 +10:00