cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 01:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,344 Commits 61 Branches 14 Tags
5bdfd1665f1ecb80f18e184fec9782eb54c1ebb8
Commit Graph

17664 Commits

Author SHA1 Message Date
Joan Lung
5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016 
New colossus loot, the "Anomalous Crystal"
 2016-09-08 22:38:50 -04:00
Ergovisavi
114676c548 Finishing up anomalous crystals 2016-09-08 19:29:49 -07:00
Joan Lung
9842424260 Merge pull request #20399 from TechnoAlchemisto/revert-20352-allaboardthenerftrain 
Re-adds the touch effect of legion souls.
 2016-09-08 22:29:47 -04:00
oranges
565b6e1bf6 Merge pull request #20391 from Shadowlight213/compdelay 
A few computer UI fixes
 2016-09-09 14:18:28 +12:00
Cheridan
f79e2de334 Merge pull request #20372 from ChangelingRain/ohbutdeartheskyislowwatchfluentseamenrigtheirrudderssotheyllgrazeitwiththeirwindarrows 
Adds another unused ashplanet turf
 2016-09-08 15:02:26 -05:00
Cheridan
b14c3df0ef Merge pull request #20384 from ChangelingRain/dontforgetthewayshepushedthewaterinsidewadingthroughthespiritslikeafloodonthefloor 
Ninja katanas are now immune to acid
 2016-09-08 15:02:06 -05:00
Jordie
4e3b001142 Adds note secrecy to allow hiding notes from non-admins (#20280) 
* adds note secrecy to allow hiding notes from non-admins

* fixes not seeing own notes

* renames notes to notes memory

* notes secrecy defaults to 1

* prompt during note creation for note secrecy

* Update NewBan.dm

* Update topic.dm

* Update sql_notes.dm

* Update client_procs.dm

* webclient tabbing error fix

* made cid detector notes non-secret
 2016-09-08 11:49:24 +02:00
Joan Lung
6863867b0e The supermatter will no longer irradiate mobs on other zlevels when it explodes. (#20356) 
* The supermatter will no longer irradiate mobs on other zlevels when it explodes.
Not if, when.

* ENTIRE OTHER ZLEVELS

* not like it fails
 2016-09-08 11:35:16 +02:00
TechnoAlchemist
effc432637 Line 278 Spacing 2016-09-08 00:53:44 -07:00
TechnoAlchemist
dc11b8d26d Fixes 2016-09-08 00:47:04 -07:00
TechnoAlchemist
4d7ffdc054 Revert "Legion soul now only heal when implanted" 2016-09-08 00:38:54 -07:00
Leo
b5ed7a0416 Legion soul now only heal when implanted (#20352) 
* Legion implant no longer heals

* Changes back to 2 blood regen

* Changes how legion souls work
 2016-09-08 17:39:24 +12:00
Shadowlight213
065413cb70 Removes rogue icon file 
Fixes issues with silicons trying to use tablets
Fixes ghosts not being able to view programs
 2016-09-07 19:18:06 -07:00
Iamgoofball
e68f52b609 LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~ (#20378) 
* LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~

disables logging for freon ice slips, good thing we got profiling and witness testimonies

* Update carbon_movement.dm
 2016-09-08 13:02:55 +12:00
Joan Lung
c25d5048b1 feedback 2016-09-07 16:45:04 -04:00
Joan Lung
4e1cff4a67 Ninja katanas are now immune to acid 2016-09-07 16:30:51 -04:00
Joan Lung
7f200976ec no message 2016-09-07 08:35:28 -04:00
AnturK
d225d4800b Station Goals (#20009) 
* goals initial

* Revamps Meteor Shield
Minor UI touchups.
Fixes DNA Vault completion check.

* Allows admins to varedit goal completion.
Does not clear dna probe on upload.

* Missed icons and template.

* Spelling, proper attackby returns

* Meteor shield emag effect only works when it's active.

* Admin panel for station goals.

* Some visual feedback and spans.

* Announcement now shows the goal name.

* Fixes

* Fixes and adminlog

* Tgui build

* Moves the information to intercept report except for admin spawned ones.
 2016-09-07 20:15:45 +12:00
Ergovisavi
4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi
8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
Joan Lung
03293aa18d CLEVER BAIT 2016-09-06 19:28:03 -04:00
Joan Lung
b3909e6f3e Adds another unused ashplanet turf 2016-09-06 17:51:24 -04:00
Cheridan
25637d3521 Merge pull request #20346 from ChangelingRain/pleasecomebackiknowicantoffermuchthebodiesicangiveyouareweakthestoriesitellareimpossiblemyworldisevenmoreprecariousthanthisonebutpleasecomeback 
SIZABLE FOWL tweaks and fixes
 2016-09-06 15:54:55 -05:00
Cheridan
3b982dd7f2 Merge pull request #20339 from ChangelingRain/ithurtstoseeyoulikethissomuchsounhappyinthosebodiesofyoursstrickenbythosestoriesforcedtoliveinsomuchpain 
Fixes the weird persistent ghost hearing bug
 2016-09-06 15:42:17 -05:00
Cheridan
db9dde5aec Merge pull request #20307 from ChangelingRain/icantevencomesaveyoubuticanpromiseonethingthereisroomforthreeinmyworldandonlytwoinhis 
The lava staff now has a delay before creating lava
 2016-09-06 15:38:15 -05:00
Cheridan
5531d1d430 Merge pull request #20351 from KorPhaeron/nerflavaland 
Mining nerf
 2016-09-06 15:36:20 -05:00
AnturK
c00cbe8e1f Merge pull request #20333 from Shadowlight213/listoflistsoflistsofslistsoflists 
Makes the tgui subsystem clean up empty lists on ui closing
 2016-09-06 15:16:06 +02:00
Joan Lung
b208e41add Watchers are now actually flying and will not fall into chasms (#20344) 2016-09-06 13:46:56 +02:00
Jordie
c74b6fc170 improves ORM location report (#20318) 2016-09-05 19:56:56 -05:00
KorPhaeron
adb89ae2b1 Lavaland Nerf 2016-09-05 19:37:17 -05:00
Ergovisavi
45394ad65d Stops dragons from flying across space to smash you with perfect accuracy (#20312) 2016-09-05 16:42:38 -05:00
Joan Lung
2db6c344a6 proppa 2016-09-05 15:41:35 -04:00
Joan Lung
84e67f3554 SIZABLE FOWL tweaks and fixes 2016-09-05 15:37:03 -04:00
Joan Lung
210d9c3b1b Fixes the weird persistent ghost hearing bug 2016-09-05 10:53:25 -04:00
Joan Lung
a1a526d1c3 Do I get off on conflicting with myself or something 2016-09-05 08:12:55 -04:00
Shadowlight213
16a2680512 Makes the tgui subsystem clean up empty lists on ui closing 2016-09-04 18:39:00 -07:00
Joan Lung
7711fba9bd The Hierophant (#19921) 
* HIEROPHANT

* whoops

* that'd be hilarious but unwise

* BIRD_SCORE

* density

* BIRD THREAT

* maybe a threat tm

* danger boss

* it's always the paren

* bird murder

* recall

* no message

* yelling bird

* time
time
come on, time
time
shades

* A ruin!

* I think five blasts is enough

* birdboss wants you dead

* giant boss arena

* hierophant no longer literally unfightable

* smaller ruin?

* no longer innate

* can toggle friendly fire, teleport is AoE

* comments!

* just fucking spawn the arena wew

* heal on resetting

* not as common

* I cannot be trusted

* eeeh

* !

* keep it off the station

* as common as sin

* stop cheesing the boss you asshole

* this looks better

* that ruin didn't even exist what the fuck

* wew

* rip

* it doesn't need full healing if it heals for half when it resets

* good for fighting mobs

* rune where you are

* mechanics; armor doesn't fucking matter rip you

* armor matters but not much so

* )

* meaner than hell and more likely to kill you

* remove those beasts from my beautiful square house

* fix

* you should be able to tell what it's doing, even if you can't actually react to it
being totally unable to tell what the fuck just killed you is bad design, you should know how you died even if you couldn't do shit
rip 3x3 chaser

* start higher scale to the same

* the ruin that doesn't exist and costs 10 points to place

* now what's all this commented out stuff hmmmmmmmmmmm
what could it possibly be

* accurate

* tracking

* boring unused lore

* it needs to be open, oranges. open.

* I did that specifically to note which commit it was on ree

* oh there's a proc for that. duh.

* logging is good

* horrifying

* the marginal kindness of a giant bird boss

* ruin tweak

* idiot bird

* adjust
 2016-09-05 10:05:35 +12:00
Incoming5643
c2ce139446 Updates a bunch of chemical descriptions because I was bored (#20300) 
* Updates a bunch of chemical descriptions because I was bored

* Shoutouts to spellchecks
 2016-09-05 09:52:45 +12:00
oranges
09e38702d2 Merge pull request #20266 from Iamgoofball/patch-121 
>there's already a global list named uplink items
 2016-09-05 08:48:43 +12:00
A-t48
4f40d955b1 Fix scrubbing freon\water vapor + fix labelling canisters with freon\water vapor (#20301) 
* Fix a bunch of atmos stuff

* undo whitespace fixes

* remove whitespace fixes
 2016-09-04 22:24:29 +02:00
Cheridan
5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear 
Bubblegum's charge now goes the full distance to the target
 2016-09-04 13:38:25 -05:00
Cheridan
40128ee502 Merge pull request #20292 from pubby/belt 
Tweak military belt TC cost from 3 -> 1
 2016-09-04 07:08:16 -05:00
Iamgoofball
82da7f1042 Removes chem gas leftovers (#20297) 
She, goof. She.
 2016-09-03 19:16:17 -04:00
Joan Lung
78da15f5f6 lovely defines 2016-09-03 17:55:02 -04:00
MMMiracles
1b4318f1a2 Combat Bears (#20215) 
* adds bear

* bear armor dlc

* bear upgrades galore
 2016-09-04 09:51:03 +12:00
oranges
ebcde4fe56 Merge pull request #20290 from ChangelingRain/feetdeepintheeartharmsdeepinthedusthandsonthemountainseyesinthesea 
Fixes some potential weird faction bugs
 2016-09-04 09:47:37 +12:00
oranges
ffed997ea4 Merge pull request #20276 from KorPhaeron/dispenser 
Exploding water tanks now actually throw the water out
 2016-09-04 09:46:34 +12:00
oranges
240a6f2823 Merge pull request #20267 from ChangelingRain/justanothersteppingstonetothenextgreatmaniacrushofdesignjustanotherstoneinthevoid 
Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer
 2016-09-04 09:45:59 +12:00
oranges
c34bcaa9ad Merge pull request #20264 from GunHog/Silicon_Ghost_Laws 
Ghosts may now examine silicons to read their laws.
 2016-09-04 09:45:33 +12:00
Cheridan
a18142f681 Merge pull request #20289 from GunHog/Errorage_Is_Really_A_Nice_Guy 
Fixes and tweaks aux base stat logging
 2016-09-03 16:20:29 -05:00