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

27382 Commits

Author SHA1 Message Date
oranges
bc3bdfce2e Allow handlewet to queue ticks properly 
hash check is working by obj name, not reference, so most handle_wet doesn't get queued
 2016-05-23 08:19:51 +00:00
oranges
a18af978e8 Revert "Remove the unique hash check for HandleWet" 
Yeah great job github, just arbitrairly change how a UI works just because I got a maintainer bit

This reverts commit 39abb77bac.
 2016-05-23 07:32:40 +00:00
oranges
39abb77bac Remove the unique hash check for HandleWet 
I don't believe it was functioning as expected.
 2016-05-23 19:29:38 +12:00
oranges
1f6c9e34a4 Merge pull request #17830 from Bawhoppen/ertfix 
Fixes ERTs not spawning with correct stuff
 2016-05-23 18:45:07 +12:00
oranges
2add4b8459 Merge pull request #17840 from Shadowlight213/pollfix 
Fixes pollcandidates not respecting prefs.
 2016-05-23 17:52:16 +12:00
oranges
b82e4652d7 Merge pull request #17791 from coiax/fix-17790 
Fixes #17790, and cleans up drone dispenser code
 2016-05-23 17:49:33 +12:00
Cheridan
c94492664f MMmiracles away mission cleanup (#17873) 
* MMmiracles away mission cleanup

* tomb ruin fix
 2016-05-23 00:46:04 -05:00
oranges
aa873306ea Merge pull request #17824 from coiax/fix-17556 
Lone Operative event now works
 2016-05-23 16:40:09 +12:00
Joan Lung
0ea41bb5ef Makes blob slightly more finite (#17866) 2016-05-22 20:55:31 -05:00
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace 
Peacekeeper Borgs
 2016-05-23 12:32:06 +12:00
Cheridan
fe5efea9c0 Merge pull request #17825 from tgstation/RemieRichards-is_type_in_fixes 
is_type_in_list() fixes
 2016-05-22 13:32:57 -05:00
Joan Lung
42d262093a Merge pull request #17761 from KorPhaeron/death_message 
Changes simple animal death message
 2016-05-22 11:48:48 -04:00
KorPhaeron
d8f8458718 Nobody in this codebase can spell collapse 2016-05-22 10:35:00 -05:00
oranges
478b198810 Fixes hellwater reagent id (#17837) 2016-05-22 10:28:11 -05:00
KorPhaeron
1130be3c1b Fixes weather killing everyone 2016-05-22 00:07:53 -05: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
Shadowlight213
b3eeb0d63e Fixes pollcandidates not respecting prefs. 2016-05-21 17:58:02 -07: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
Lularian
19eae8c0aa ert medbeammemes 2016-05-21 13:55:25 -05:00
Jack Edge
0ce5f8582c Lone Operative event now works 
Fixes #17556.

Also, a bug where the lone op would spawn with the combat mode on the
sapce helmet has been fixed.
 2016-05-21 15:18:52 +01:00
Remie Richards
9e5a8f4475 is_type_in_list() fixes 
is_type_in_list() will now detect non-numeric associative values, to avoid unnecessary conversions that would break the list, for example:
Grinding uses a type = list("results" = amount) format, with list() not being a number it was then converted to type = 1, this conversion was unnecessary as a list() is still true and all we want in the associative value is a truth value, not specifically a 1.
 2016-05-21 15:07:02 +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
Jack Edge
f35983978b Reee, etc. 2016-05-21 13:16:44 +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
4a76edf5fa Fixes #17790, and cleans up drone dispenser code 
- Drone dispensers now run on a timer based system like what shuttles do.
- Fixed #17790, they now dispense drones.
- Fixed what was a probably really old bug in material containers that
no one's encountered before probably.
- Dispensers don't prompt you for sheet amounts, they eat them all like
an autolathe.
- Dispensers now, by default, only pump out three shells before pausing.
 2016-05-21 11:27:12 +01: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