cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,329 Commits 61 Branches 14 Tags
7d43330be4e22290a2d70b27f09a1fdec5efe6cf
Commit Graph

27334 Commits

Author SHA1 Message Date
Incoming5643
7d43330be4 Unbreaks the parrot 2016-05-22 01:35:14 -04:00
oranges
a2223c25c3 Merge pull request #17801 from bgobandit/gibberagain 
The gibber produces properly named monkey meat.
 2016-05-22 13:11:22 +12:00
Joan Lung
64e850f38b Merge pull request #17775 from coiax/fix-17480 
Fixes #17480; tabling not breaking glass tables
 2016-05-21 21:00:47 -04:00
bgobandit
e96a09a801 clarifies name 2016-05-21 19:29:20 -04:00
oranges
a8a86c88ac Merge pull request #17820 from Core0verload/syndieslepeers 
Replaces sleepers in Syndicate shuttle with Syndcate-colored ones
 2016-05-22 11:18:42 +12:00
oranges
2bbc778899 Merge pull request #17759 from KorPhaeron/weather_immunity 
Weather Immunity Refactor
 2016-05-22 11:17:04 +12:00
pudl
2c468783af buffs bees 2016-05-21 14:48:41 -05:00
coiax
982a0a76b6 Removes monster spawning from ruin areas (#17688) 
- Specifically, this is a post-template selection, pre-template
placement deletion. So templates can continue to have simple animals,
it'll only clash if they overlap.

🆑 coiax
rscdel: Lavaland monsters have started giving the ruins a wide berth
recently.
/🆑
 2016-05-21 20:15:27 +01:00
oranges
5a800f970b Merge pull request #17623 from RemieRichards/ItsAlive!ITSALIVE! 
Enables Frankensteins
 2016-05-22 01:54:02 +12:00
oranges
0b4488f8b8 Merge pull request #17553 from coiax/be-still-my-beating-heart 
Legion hearts renamed and reskinned to legion's soul
 2016-05-22 00:59:43 +12:00
Jack Edge
82252c1843 Legion heart is now legion soul 2016-05-21 13:50:11 +01:00
Jordie0608
a11b6f53da yes way 2016-05-21 22:34:17 +10:00
oranges
37d5d0251e Merge pull request #17797 from NicholasM10/testing 
Added two new foods - Khinkali and Khachapuri
 2016-05-22 00:24:17 +12:00
Jack Edge
dc5c609cf5 Legion hearts stop beating when becoming inert 
Also readded the statistical tracking that got taken out during the
dismemberment merge, I assume accidentally.
 2016-05-21 13:23:58 +01:00
Nick M
b7eb553c8a Fixed spacing 2016-05-21 15:22:10 +04:00
oranges
3838037c97 Merge pull request #17744 from lordpidey/lordpidey_jauntfix 
Fixes a few cases when you can get stuck in your infernal jaunt.
 2016-05-21 23:16:48 +12:00
Nick M
ea0e2b1812 Placed reagent at top in list 2016-05-21 15:03:14 +04:00
oranges
1344474fb5 Merge pull request #17637 from Razharas/Minigun 
Makes miniguns overheat on action
 2016-05-21 22:58:45 +12:00
oranges
8d6da5d01f Merge pull request #17796 from bgobandit/sofuckingmetal 
Runed metal no longer deletes girders when used on them.
 2016-05-21 22:56:45 +12:00
oranges
1bb4465ac7 Merge pull request #17767 from lordpidey/ninja_fix 
Fixes antaghud for ninjas
 2016-05-21 22:55:02 +12:00
oranges
b3acc5999d Merge pull request #17773 from Shadowlight213/safetycat 
Makes runtime not save family if killed
 2016-05-21 22:52:26 +12:00
oranges
4348a9fb54 Merge pull request #17789 from coiax/fix-17782 
Fixes #17782 and #17807; KA now can't be spam reloaded, spam improved
 2016-05-21 22:50:26 +12:00
oranges
ce0dbf8f85 Merge pull request #17653 from coiax/fix-dragon 
Dragon gibbing fix, host sword checks more
 2016-05-21 22:46:20 +12:00
oranges
c23fa08d5b Merge pull request #17591 from Iamgoofball/patch-29 
Heads of Staff now have basic Maint access
 2016-05-21 22:43:21 +12:00
Mercenaryblue
7603b900c4 [s] Golden Bike Horn Fix (#17679) 
* Golden Bike Horn 1.0.5

Fixing code returning before flipping mobs.

* Fix 2

Return ..()
Fully tested.
Works perfectly now.
 2016-05-21 22:42:07 +12:00
Jack Edge
8ff4486ab7 Fixes #17480; tabling not breaking glass tables 
Fixes #17480.

Also catches a rare case where people would be thrown onto the tables
from afar by checking whether there are any mobs on the table with
a spawn call.

- Glass tables are now coloured by Nar'sie.
- Glass tables pregenerate and store their shatter debris.

🆑 coiax
fix: Glass tables now break when people are pushed onto them.
/🆑
 2016-05-21 10:48:04 +01:00
AnturK
c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart 
Lungs and hearts for mutant species
 2016-05-21 11:08:05 +02:00
c0
d5672fa129 Replaces sleepers in Syndicate shuttle with Syndcate-colored ones 2016-05-21 05:56:40 +03:00
oranges
b3c3c0bf01 Merge pull request #17748 from ChangelingRain/objectivechecks 
Fixes a few things potentially preventing hijack objectives
 2016-05-21 14:51:16 +12:00
oranges
6486b588c6 Merge pull request #17333 from nullbear/less-wetness-updates.-Ice-sliding-in-no-slips- 
Wetness stuff.
 2016-05-21 14:46:09 +12:00
Jack Edge
66683de76e Removed incorrect react() call 2016-05-21 03:30:34 +01:00
Joan Lung
2bb7c61357 Merge pull request #17793 from coiax/fix-17702 
Cow tipping now gives messages to the cow
 2016-05-20 22:27:19 -04:00
coiax
64742c25fb Neurotoxin spit gives newtonian move (#17770) 
🆑 coiax
rscadd: Neurotoxin spit can be used as makeshift space propulsion
/🆑
 2016-05-20 14:42:32 -05:00
Jack Edge
490dacf586 Fixes the other thing 2016-05-20 17:10:38 +01:00
Cheridan
c1d8385a31 Merge pull request #17781 from Razharas/MobFix 
Fixes cliented and Aied mobs moving
 2016-05-20 06:40:57 -05:00
Cheridan
328a69ebf2 Merge pull request #17396 from KorPhaeron/security 
Gives the HoS a pinpointer
 2016-05-20 06:35:30 -05:00
Cheridan
9dd5aee783 Merge pull request #17717 from MrStonedOne/istypeinlist 
Makes is_type_in_list() much faster (thanks remie)
 2016-05-20 02:41:49 -05:00
WJohn
ad4b19473b Merge pull request #17783 from KorPhaeron/hardestmetalknowntoman 
Drake Armour sprites
 2016-05-20 03:08:25 -04:00
bgobandit
f52cbbd43b Fixes meat naming. 2016-05-20 00:30:35 -04:00
Robustin
c468ef54c1 Fixes Lube's Confusion Stacking """"bug"""" (#17693) 
* Aft Maint Pantry

* Added files via upload

* Cult Phase Icons

* Cult Phase Icons

* Veil Shifter Icon

* ROGUE PLUS SIGN

* More sensible alternative

* gravity check, probably

* SlipCheck

* TIL
 2016-05-19 19:30:03 -05:00
Iamgoofball
0f86c19460 Fixes another wrestling permaflip (#17777) 
2 wrassle 5 me
 2016-05-19 19:28:07 -05:00
Cheridan
23d8de67c9 Merge pull request #17445 from bgobandit/ayygentb 
Adds BZ, a hallucinogenic gas. [MAP EDIT]
 2016-05-19 18:14:18 -05:00
Cheridan
a7114754bd Merge pull request #17772 from bgobandit/importantgibpr 
The gibber produces gibs again.
 2016-05-19 17:13:26 -05:00
Nick M
57e2d71fbe Added khachapuri 2016-05-20 01:04:25 +04:00
bgobandit
b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00
Nick M
0c94cafe6b Merge remote-tracking branch 'upstream/master' into testing 2016-05-20 00:06:53 +04:00
Nick M
605e6f8ba8 New sprites 
Made by OPDingo from coderbus, I think! I forgot exact name, sorry, but
thank you very much.
 2016-05-19 23:47:26 +04:00
Nerd Lord
d90d6fe314 no message 2016-05-19 12:30:47 -04:00
Jack Edge
6575fa21c9 Cow tipping now gives messages to the cow 
Fixes #17702.
 2016-05-19 17:17:45 +01:00
Nerd Lord
7bd4336044 no message 2016-05-19 12:09:56 -04:00