cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-25 00:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,904 Commits 59 Branches 14 Tags
076ed1a221e15d5923bf827b51d429e9769adbba
Commit Graph

78 Commits

Author SHA1 Message Date
Ashe Higgs
7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744) 
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
 2018-02-26 09:50:16 +13:00
XDTM
2ac902ab3c Refactors anti-magic into a component (#35639) 
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
 2018-02-26 09:45:12 +13:00
XDTM
f56d3c35bb Adds limitations to brain traumas (#35938) 
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
 2018-02-25 18:59:55 +02:00
Jordan Brown
845743c1ce Merge pull request #35912 from ShizCalev/time-cleanup 
Cleans up some time stuff with DisplayTimeText
 2018-02-24 00:38:16 -05:00
BordListian
6da8820fee Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796) 
* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one
 2018-02-23 21:34:53 +02:00
ShizCalev
3ab8b52cd3 Cleans up some time stuff with DisplayTimeText 2018-02-22 15:33:45 -05:00
MetroidLover
67ae3abb29 Updates Ninja welcome text (#35863) 2018-02-21 23:46:50 -05:00
oranges
cbe5d20b9b Merge pull request #35593 from Robustin/marauderfix2 
Marauder limit fixed
 2018-02-22 09:48:18 +13:00
Jordan Brown
362276848f Merge pull request #35775 from kevinz000/night_shift 
[READY]Randomized Station Time + Night Shifts
 2018-02-21 13:01:33 -05:00
81Denton
5e4c3c3e9f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 12:38:09 -05:00
81Denton
5e93a1a1a9 Renames various reagent IDs to be more descriptive (#35824) 
* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION
 2018-02-21 12:36:05 -05:00
ShizCalev
d0f10d151e [s] Cameranet fixes (#35733) 2018-02-21 10:30:27 -03:00
kevinz000
8ebc63d2f2 Randomized Station Time + Night Shifts 2018-02-20 21:59:44 -08:00
Cruix
26a3a378a8 Fixed instant summon behavior with simple animals (#35780) 
Removed hand slots from lots of things that should not have them
 2018-02-20 10:04:26 +13:00
XDTM
9d41e9734d Extensive surgery additions (#35520) 
* Extensive surgery additions

* ,

* bioware

* restrict

* implants

* oops my hand slipped

* "i only changed a few lines, surely it's gonna compile, let's just push it and be done with it" --me, once again

* zombie surgery

* Adds brainwashing antag datum

* Antur Reviews

* @Antur part 2

* wow
 2018-02-19 14:29:06 +02:00
Ashe Higgs
92a57f9b9e Fixes invincible blobs and blob nodes producing tiles after its death (#35706) 
* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm
 2018-02-18 20:03:12 -05:00
Jordan Brown
c2a691214d Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 01:47:09 -05:00
AnturK
a5bcb83ea7 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 11:34:38 -05:00
AnturK
38786f96fe Fixes AI dating 2018-02-16 09:35:44 +01:00
AnturK
4c2f2b955b Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 01:44:41 -05:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
oranges
82af086fd8 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-16 15:34:37 +13:00
FrozenGuy5
31d9388e33 Spellchecks announcement's grammar (#35636) 
* no <br>

* i shall not take the risk
 2018-02-15 00:10:23 -05:00
AnturK
7a7798f418 Cleans up remnant traitor cyborg code and AI hacking. (#35586) 2018-02-15 00:01:15 -05:00
AnturK
d3cb9c2b9a Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 20:43:24 -05:00
ShizCalev
bf901492bf Fixes invalid throwat args (#35565) 2018-02-13 14:13:48 +01:00
Robustin
6a5c750fb5 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 16:17:58 -05:00
Robustin
6b35df24f3 Tested marauder fix 2018-02-12 13:57:05 -05:00
Dax Dupont
fc03caa700 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) 2018-02-12 17:19:59 +02:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521) 
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
 2018-02-12 17:16:47 +02:00
AnturK
c3c9f4c668 Highlander antag datum (#35519) 
* Highlander antag datum

* Forgot debug line

* Also this
 2018-02-11 16:32:06 -05:00
ShizCalev
3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456) 
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
 2018-02-11 16:06:12 +13:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup 
Replaces some var values with defines
 2018-02-10 12:10:40 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Jordan Brown
ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt 
Revert "Adds the saltmine shuttle. (#35369)"
 2018-02-09 00:03:36 -05:00
Robustin
7dee5379d7 Cult fixes and UI improvement (#35178) 
* Blood spell fixes and UI improvement

* Bastard sword bug

* Update blood_magic.dm

* woops parenthesis

* Update blood_magic.dm

* space
 2018-02-09 14:10:50 +13:00
oranges
b1f301b39b Revert "Adds the saltmine shuttle. (#35369)" 
This reverts commit c7ee29b5b0.
 2018-02-08 01:49:57 +00:00
Dax Dupont
c7ee29b5b0 Adds the saltmine shuttle. (#35369) 
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
 2018-02-07 15:16:54 +02:00
vuonojenmustaturska
e264c15aac Merge pull request #35385 from AnturK/custoantagfixup 
Fixes custom antags for random event morph/slaughter demon.
 2018-02-07 13:22:38 +02:00
Robustin
616444a14c Reverts oysters (#35361) 2018-02-06 16:43:06 -05:00
vuonojenmustaturska
3db6e34dda Merge pull request #35353 from Robustin/constructlimit 
Reduced shards and shells for the cult
 2018-02-06 21:37:28 +02:00
AnturK
4a046df6df Fixes custom antags for random event morph/slaughter demon. 2018-02-06 14:59:33 +01:00
Robustin
b87a9f6a15 Fixed insufficient cultists warning (#35292) 
* Fixed insufficient cultists warning

* Insufficient cultist fix

* removed duplicate var

* Update runes.dm
 2018-02-06 13:54:17 +01:00
coiax
5b0221f49b Egg changes (#35268) 
🆑 coiax
add: Eggs now contain 5u of egg yolk. Breaking an egg in a glass
container adds all reagents inside to the container. If you're laying
acidic eggs, then you'll get 5u of egg yolk and 10u of sulphuric acid.
Egg glands now make you act like a chicken while laying eggs. Egg laying
makes you use the aliennotice span.
/🆑

- coloured eggs no longer have "taste_desc", as that only applies to the
nutrient reagent, which eggs no longer have.

This makes eggs more consistent in their contents and behaviour, and
prevents you from using eggs laid by abductor egg glands in cooking
without removal of the acid first.
 2018-02-06 13:50:22 +02:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095) 
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
 2018-02-06 11:02:53 +01:00
AnturK
126a544a74 Slaughter demon, Morph, ERT / Deathsquad antag datums. (#35156) 
auto_custom need to go so mind.objectives and special_role can go so here's a start. The rest will come in this PR or another if i get lazy.
 2018-02-06 11:59:18 +13:00
vuonojenmustaturska
1e125e3254 Merge pull request #35322 from AnturK/missing-wrapper 
Adds missing wrapper for abductor roundend report.
 2018-02-05 23:46:58 +02:00
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291) 
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
 2018-02-05 22:27:35 +01:00
Robustin
1b4a5574db Reduced construct shells from archive 2018-02-05 12:48:08 -05:00