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

10142 Commits

Author SHA1 Message Date
Jordan Brown
7b196a6ad5 Merge pull request #36824 from Robustin/mblood 
Monkeys can now die of bloodloss
 2018-04-01 01:17:28 -04:00
AnturK
2a2fed3899 missed this one 2018-03-31 16:32:34 +02:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Cruix
251c54223d Added a new ability to sentient diseases (#36548) 
* Replaced body zone magic strings with defines

* Added the Secrete Infection ability to sentient diseases, and updated the infective component
 2018-03-30 21:09:19 +02:00
ShizCalev
485efbd338 Fixes mutant bodypart assignments (#36816) 
* Fixes mutant bodypart assignments

* comment
 2018-03-30 21:42:00 +03:00
Robustin
c67b0c181e bad zombie monkey 2018-03-30 11:58:48 -05:00
kevinz000
08c4d9a0a6 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794) 
* job availability

* avail

* Boop
 2018-03-30 12:04:48 -04:00
KorPhaeron
1e052d6166 Being buckled to an object means space wind wont pull you (#36783) 
* Being buckled to an object means space wind wont pull you

* Puts check in the proper place
 2018-03-30 04:27:26 -04:00
Robustin
8af5c7b6d6 monkeys can now die of bloodloss 2018-03-30 03:40:45 -04:00
John Ginnane
c3627c2741 Adds guillotine (#36540) 
* Add guillotine to the game

Can be found in BoxStation's courtroom. Also added some sounds to the clap emote, which is used during execution

* Made requested changes

* minor typo

* Updated code

* Added crafting recipe and removed from map
 2018-03-28 10:41:03 +13:00
vuonojenmustaturska
045192b3cf Merge pull request #36636 from ShizCalev/robo-limb-shake-message 
Fixes prosthetic limbs injury messages
 2018-03-27 20:59:13 +03:00
vuonojenmustaturska
a6c9a2280f Merge pull request #36617 from ShizCalev/logging-cleanup 
Improves some logging legibility
 2018-03-27 20:56:39 +03:00
vuonojenmustaturska
0226f4d168 Merge pull request #36734 from Robustin/colossusfix 
Colossus projectile runtime removal
 2018-03-27 20:52:03 +03:00
vuonojenmustaturska
bc8958cc14 Merge pull request #36541 from XDTM/NOTTHEBEES 
Swarming component! Beware of bees
 2018-03-27 17:04:09 +03:00
Dax Dupont
5ead81a026 Robot hats fix and addition (#36543) 
* Robot hats fix and addition

* berets too

* more hats
 2018-03-26 22:35:28 -04:00
Tad Hardesty
bf9ad94925 Fix runtime when shaking camera with duration between 0 and 1 (#36726) 2018-03-26 22:25:14 -04:00
Ashe Higgs
b6b1230231 Fixes slimeperson traits (#36663) 2018-03-26 22:11:33 -04:00
Jordan Brown
d44571dd7f Merge pull request #36712 from XDTM/NoPunchingIan 
Fixes pacifists being able to attack animals
 2018-03-26 15:18:57 -04:00
Jordan Brown
d612a50a06 Merge pull request #36710 from fludd12/Inky-Capped-Lists 
Properly Blacklists Mushroom People
 2018-03-26 15:17:34 -04:00
Robustin
3095b6d2fb Colossus projectile runtime removal 2018-03-26 13:31:46 -04:00
XDTM
17d62d54eb . 2018-03-25 17:43:03 +02:00
XDTM
cad0ba11d2 Fixes pacifists being able to attack animals 2018-03-25 17:20:49 +02:00
Robustin
78756758b5 Monkey AI is now 10,000% more processor friendly (#36641) 
* Simplified monkey define

* Streamline monkey processing

* 1000% better monkey AI

* Multiple maintainers approved merging this
 2018-03-25 18:20:20 +03:00
fludd12
bffc8a2448 Properly Blacklists Mushroom People 2018-03-25 06:39:13 -04:00
AnturK
735dad092e Sintouched antag datums (#36561) 
* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs
 2018-03-25 06:07:26 +03:00
Davidj361
b604d93336 Fixed Ranged Guardian moving when recalled (#36643) 2018-03-24 06:35:35 -04:00
kevinz000
4a23703622 Combat Overhaul Staging: Limb Specific Stamina and status effect clickdelay modifiers! (#36274) 2018-03-23 12:36:35 +01:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
ShizCalev
56d7a53702 Fixes prosthetic limbs injury messages 2018-03-23 01:33:58 -04:00
Qustinnus
fc391b5be4 does the thing (#36605) 2018-03-22 22:58:28 -04:00
oranges
3254b5b594 Merge pull request #36380 from vuonojenmustaturska/sauerbraten 
Nerfs monkey spam
 2018-03-23 09:42:18 +13:00
Emmett Gaines
172a307c5b Count gorilla transforms (#36563) 2018-03-22 00:31:19 -04:00
ShizCalev
79b59c5471 Improves some logging legibility 2018-03-21 23:37:00 -04:00
PKPenguin321
af3af82d3e mobs will stop pulling things on death (#36581) 2018-03-21 22:55:29 -04:00
Qustinnus
af2afa1cc0 Being happy no longer makes you obese. (#36565) 
* D O U B L E N E G A T I V E

* jesus
 2018-03-21 16:34:46 -04:00
fludd12
97534f2ac3 [Ready] Slime Crossbreeding! (Part 1 of 2!) (#35986) 
* Slime Crossbreeding!

* Shifts a few things around.

* Prismatic extracts!

* Self-sustaining extracts!

* Consuming extracts!

* Recurring extracts!

* Whups!

* Regenerative extracts!

* Stabilized (unfinished)

* More stabilized!

* This took more effort than it should have.

* Industrial extracts!

* Icons!

* Colors the crosses.

* Bugfixes galore!

* Burning extracts!

* Sounds!

* Starts on burning extracts.

* Charged extracts!

* Minor adjustments to the adamantine shield.

* Fixes map! Ready!

* Fixes problem children, changes consuming extracts

* I'm an idiot.

* Fixes playsounds, unnecessary srcs.

* Removes a gross text2path

* Resolves a conflict

* More AnturK fixes.

* Fixes two other things, too.

* Burning black extracts use shapeshifting now.

* Love Potion now mostly RP in use, aligns user factions.

* Iterative discovery of status effects.
 2018-03-21 21:04:26 +01:00
XDTM
220f0588ad Fixes some more trauma bugs (#36487) 
* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm
 2018-03-20 21:31:08 -04:00
KorPhaeron
c72743e4cf April Fools Day replaces the overflow role with Clowns (#36533) 
* Refactors overflow job assignment

* Fixes job selection
 2018-03-20 18:02:23 -04:00
Jordan Brown
2d4b9568dc Merge pull request #36532 from Robustin/idle_vision_removal 
Removes idle_vision_range from simple mobs
 2018-03-20 10:38:09 -04:00
Jordie
9c1731e75b Distinguishes law types by colour (#36463) 
* distinguishes law types by colour

* hacked laws now separate from ionic

* fix and less src.

* moves hacked laws above ion

* also the ai fixer

* also missed order in stating laws

* Less garish blue
 2018-03-19 20:31:51 -04:00
XDTM
415e977509 Swarming component! Beware of bees 2018-03-19 23:36:38 +01:00
Ian Turk
fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Robustin
1fc07e251a Dupe var 2018-03-19 11:09:24 -04:00
Robustin
6adcaacd38 Removes idle_vision_range var 2018-03-19 11:04:36 -04:00
Davidj361
08addce4f2 New & Fixed AI VOX Sound Files (#36492) 
* AI VOX file updates

Fixed: go, area, bag, barracks, close, code, cyborgs, down, duct, got, hole, lima, mode, motorpool, 'O', roger, slow, virology, 'W', xenobiology, 'Z'
Added: brig, wing, engineering, hall, hallway, machine, humans, air, atmosphere, dangerous, kitchen, bar, lusty, pressure, dormitory, botany, chapel, office, sabotage, atmospherics, warden, detective, chief, engineer, multitude, bitcoin, harmful,
many, atmospheric, technician, director, scientist, roboticist, chemist, geneticist, virologist, janitor, bartender, cook, botanist, mime, chaplain, curator, quartermaster, shaft, miner, assistant, lawyer, drone, personal, revolution, revolutionary,
cult, cultist, wizard, magic, rune, changeling, lifeform, form, devil, demon, blob, slaughter, murder, clockwork, blood, abduction, kidnapped, kidnapping, entity, death,
humanoid, lavaland, wire, modification, tampered, change, possible, impossible, riot, dead, section, virus, disease, creature, plausible, false, true, freezing, cold, vitals,
weak, strong, vacuum, unknown, server, rogue, equipment, prison, prisoner, theater, canister, piping, quarantine, internals, space, construct, advised, explosive, bomb,
formed, created, enabled, disabled, restoration, beware, critical, destruction, questionable, answer, unable, fix, airlock, ugh, ughh
Make file sizes as small as possible.

* Updated the according code for the new files

* More sound files added

* Added the sound files to the list and changed announcement help.

* More AI sounds files
if, very, stay, tech, technology, killed, monkey, animal, corporation, gravity, generator, ian, runtime, corgi, vendor, console, circuit, authentication, disk, beam, unsafe, crate, assistance, bleed, hurt, slip, slippery, clowning, oxygen, nitrogen, carbon, dioxide, library, departures

* Updated announcement list with new sounds

* Added 'where'
 2018-03-18 14:46:22 -04:00
Qustinnus
4911991f70 [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344) 
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
 2018-03-18 19:48:50 +13:00
81Denton
c6369ec3eb Changes stormtrooper ammo to 10g slugs (#36364) 
* pulse slug instead of buckshot

* 10 gauge baby

* 10g name
 2018-03-17 15:46:32 +02:00
TheDreamweaver
6cfd7ad9ad Fixes dupe and runtime issues with Rod of Asclepius (#36410) 
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
 2018-03-17 15:21:48 +02:00
AnturK
343d2ab38d Allows traitor AI's to take direct control of turrets. (#36154) 
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
 2018-03-17 11:30:41 +13:00
kevinz000
fe5fdec776 [READY] Refactors wet floors to a component (#36130) 
* Wet Floor components

* No more turf wet slide.
 2018-03-17 11:26:09 +13:00