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

56414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnturK
346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
tgstation-server
c46918fde5 Automatic changelog generation for PR #37516 [ci skip] 2018-05-01 07:56:21 -07: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
tgstation-server
43c43b3e3e Automatic changelog generation for PR #37579 [ci skip] 2018-05-01 05:29:44 -07:00
Tad Hardesty
e268d6fe52 Fix placing boxes in storage implants (#37579) 2018-05-01 08:29:41 -04:00
XDTM
e733e139c5 fix 2018-05-01 12:23:20 +02:00
tgstation-server
2218113b8b Automatic changelog generation for PR #37570 [ci skip] 2018-04-30 19:21:29 -07:00
Jordan Brown
b0c31b5d0d Merge pull request #37570 from BuffEngineering/WestSolars 
Fixes mapping issue on deltastation
 2018-04-30 22:21:27 -04:00
Jordan Brown
40fbd57c85 Merge pull request #37593 from optimumtact/revertarmshit 
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-04-30 22:20:52 -04:00
Jordan Brown
ad686aadd9 Merge pull request #37561 from AnturK/customloadingfix 
Fixes loading custom aways.
 2018-04-30 22:19:59 -04:00
tgstation-server
1447273e44 Automatic changelog generation for PR #37560 [ci skip] 2018-04-30 19:19:48 -07:00
Jordan Brown
61ed68053a Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols 
Fix mecha maintenance protocol button always saying Initiate
 2018-04-30 22:19:45 -04: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
8ce7d19c9c Merge pull request #37565 from ninjanomnom/component-limbo 
Modifies component transfer to make ChangeTurf able to transfer components
 2018-04-30 22:16:47 -04:00
Jordan Brown
d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 22:16:02 -04:00
tgstation-server
6185067db9 Automatic changelog generation for PR #37572 [ci skip] 2018-04-30 19:14:54 -07: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
oranges
9465eb5130 Revert "fixes a pacifism kill through crushing firelocks! (#37511)" 
This reverts commit 41eb3276fb.
 2018-04-30 22:02:50 +00:00
ninjanomnom
ff856e4bf5 Proper method fixes 2018-04-30 15:54:59 -04:00
Alomga
f3840f8715 Makes dizziness work again 2018-04-30 14:38:37 -04:00
tgstation-server
c31307ca13 Automatic changelog compile, [ci skip] 2018-04-30 18:08:28 +00:00
tgstation-server
3f114001ee Automatic changelog generation for PR #37510 [ci skip] 2018-04-30 11:05:05 -07: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
tgstation-server
9efc0442b7 Automatic changelog compile, [ci skip] 2018-04-30 17:50:59 +00:00
tgstation-server
21de546379 Automatic changelog generation for PR #37539 [ci skip] 2018-04-30 10:49:54 -07:00
Jordan Brown
0fc0625ed2 Merge pull request #37539 from pigeonsk/sakememe 
Ports sake with new sprites
 2018-04-30 13:49:51 -04:00
tgstation-server
fb8fe60c52 Automatic changelog generation for PR #37556 [ci skip] 2018-04-30 10:48:26 -07:00
Jordan Brown
d4091e606c Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 13:48:23 -04:00
tgstation-server
afbb65a5c8 Automatic changelog generation for PR #37554 [ci skip] 2018-04-30 10:47:40 -07: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
vuonojenmustaturska
aec59e6c62 Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 17:33:25 +03: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
tgstation-server
a29f206c9b Automatic changelog generation for PR #37494 [ci skip] 2018-04-30 03:01:46 -07: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
tgstation-server
e2b023dcfc Automatic changelog generation for PR #37499 [ci skip] 2018-04-30 02:57:08 -07:00
vuonojenmustaturska
6f10c97329 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 12:57:05 +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
tgstation-server
2672b8ff34 Automatic changelog generation for PR #37498 [ci skip] 2018-04-30 02:52:14 -07: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
tgstation-server
1db93fcff0 Automatic changelog generation for PR #37496 [ci skip] 2018-04-29 23:32:37 -07:00
Evsey Antonovich
c031e666b3 IC weapons only works on turfs (#37496) 2018-04-30 02:32:34 -04:00
kevinz000
c044cc33c4 Removes excess signal 2018-04-29 23:27:57 -07:00