cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 18:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,414 Commits 61 Branches 14 Tags
346819e30c4e4b94de6871d4441b52c06995e770
Commit Graph

25102 Commits

Author SHA1 Message Date
AnturK
346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
Jordan Brown
6ff57368b0 Merge pull request #37516 from XDTM/LinearBrainDamage 
Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-01 10:56:18 -04:00
XDTM
e733e139c5 fix 2018-05-01 12:23:20 +02:00
Jordan Brown
f91f5bb08f Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes 
Fix runtimes in corpse code due to mob_spawners becoming null
 2018-04-30 22:19:26 -04:00
Jordan Brown
748d9a9233 Merge pull request #37572 from deathride58/fixesdepression 
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-04-30 22:14:51 -04:00
Alomga
f3840f8715 Makes dizziness work again 2018-04-30 14:38:37 -04:00
Jordan Brown
0ebc0d81b2 Merge pull request #37510 from JJRcop/throw_myself 
Circuits can't throw themselves
 2018-04-30 14:05:01 -04:00
Jordan Brown
32f2f07e4d Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 14:02:59 -04:00
Jordan Brown
2a2ad8fd79 Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 13:52:52 -04:00
Jordan Brown
0fc0625ed2 Merge pull request #37539 from pigeonsk/sakememe 
Ports sake with new sprites
 2018-04-30 13:49:51 -04:00
Jordan Brown
d4091e606c Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 13:48:23 -04:00
Jordan Brown
7e3b4e47a3 Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 13:47:37 -04:00
deathride58
336259d58b i give up - removes the speculation/performance modifier instead. 2018-04-30 10:32:58 -04:00
Pigeons
f879167156 Adds sake to boozeomat 2018-04-30 07:17:01 -04:00
Jalleo
5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 13:01:43 +03:00
ShizCalev
d86c2818a5 Removed /obj/item/asteroid path (#37500) 
* Cleans up some item paths

* removed kebab
 2018-04-30 12:57:36 +03:00
kevinz000
dc60377444 Fixes circuits being able to detect ghosts and fix pinless guns (#37437) 
* Circuit exploit fixes

* Update input.dm
 2018-04-30 12:56:18 +03:00
kevinz000
f31c01cecb beam rifle delay (#37544) 2018-04-30 12:54:25 +03:00
Fox McCloud
6cbf4483ee Fixes Blast Cannon (#37503) 
* Fixes Blast Cannon

* no magic numbers

* tweak
 2018-04-30 12:53:59 +03:00
ShizCalev
65ebea8413 [s] Fixes the fryer shrinking the size of objects (#37489) 
* Fixes the fryer shrinking the size of objects

* few more vars
 2018-04-30 12:52:46 +03:00
ShizCalev
b0387b17da Fixes glass stack explosion act (#37498) 2018-04-30 12:52:11 +03:00
Denton
82cf848456 removes HUDsunglasses from the premises 2018-04-30 09:46:08 +02:00
Evsey Antonovich
c031e666b3 IC weapons only works on turfs (#37496) 2018-04-30 02:32:34 -04:00
ShizCalev
ac2967fa66 Moved to vars 2018-04-30 01:20:37 -04:00
Mickyan
ed3a11e2b8 Makes nutrition level show up on self-inspect (#37509) 
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
 2018-04-30 01:19:20 -04:00
george99g
f28092423a Deactivate suicide prescans via ghost var (#36839) 
* Create suicide_log proc in /mob/living

Suicide logging moved to there.

* Stop after-suicide prescan clones
 2018-04-30 14:35:00 +12:00
deathride58
8e63755bdb fixes the intergalactic stock market crash 2018-04-29 22:13:27 -04:00
erwgd
d988406583 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-30 10:53:42 +12:00
vuonojenmustaturska
3eb30b16f3 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use (#37530) 
code: HEALS_EARS_2 is removed in favor of the earhealing component

code: wearertargeting component is available to subtype for components that want to target the wearer of an item rather than the item itself
 2018-04-30 10:32:59 +12:00
vuonojenmustaturska
ccf8fc5bc5 Kills off three more flags from flags_2 (#37529) 
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
 2018-04-30 10:32:23 +12:00
oranges
d9f9368c1d Merge pull request #37535 from cyclowns/fusion-fix 
Fixes gas fusion power not being taken into account
 2018-04-30 10:20:01 +12:00
Tad Hardesty
9f0f3bd32c Fix runtimes in corpse code due to mob_spawners becoming null 2018-04-29 13:59:41 -07:00
Tad Hardesty
d0ae8933c0 Fix grammar when cleaning things with the damp rag 2018-04-29 14:28:52 -05:00
Denton
cb884c8dce sunglasses and more holosigns for techwebs 2018-04-29 19:20:51 +02:00
Dax Dupont
841a6aff93 Adds some more reagents to clogged vents 2018-04-29 18:57:10 +02:00
iksyp
870dd9edff Makes pacifists able to use .50BMG Soporific Rounds (#37506) 
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
 2018-04-29 11:13:12 -04:00
ShizCalev
386f1ad622 Fixes invisible turtleneck alt state 2018-04-29 10:06:44 -05:00
ShizCalev
0bcdc963c1 Resolved var name conflict for bounce_away() 2018-04-29 09:59:13 -04:00
vuonojenmustaturska
ac55920c62 I'll get you next time, gremloids 2018-04-29 08:53:52 -05:00
Pigeons
066f7bac84 Two new sprites for the subtypes 2018-04-29 01:25:08 -04:00
Pigeons
3e27e0562b Adds sake 2018-04-28 22:16:53 -04:00
cyclowns
4b36b9db2b gas.dangerous -> gas.fusion_power 2018-04-28 16:29:23 -07:00
oranges
4f9006681e Revert "You can no longer equip pet collars on humans" 
This reverts commit 7935f2b407.
 2018-04-28 23:19:58 +00:00
oranges
e2f617e962 Merge branch 'pets' into upstreamunsafemaster 2018-04-28 23:18:59 +00:00
oranges
d30da792ce Merge remote-tracking branch 'upstream/master' into pets 2018-04-28 22:58:09 +00:00
Jordan Brown
e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 15:55:56 -04:00
vuonojenmustaturska
98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486) 
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
 2018-04-28 13:22:28 -05:00
XDTM
48739b563e Changes the trauma formula so constant small ticks don't keep triggering traumas 2018-04-28 11:47:55 +02:00
ShizCalev
e6ef83f059 Adds pineapple traits 2018-04-28 02:55:59 -04:00
as334
7d32eba2a1 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 18:01:39 +12:00