cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,214 Commits 61 Branches 14 Tags
078fc313372effcae2a809bc458ad66edbb529e5
Commit Graph

823 Commits

Author SHA1 Message Date
GunHog
0575213666 Tweaks Aux Base Stat Logging 
Aux Mining Base stat logging actually works now, and includes the
coordinates where the base lands.
 2016-09-02 14:36:28 -05:00
kevinz000
29779ed0ee chestproofing 2016-08-29 19:12:57 -07:00
kevinz000
a6af5eadb4 Revert "lavaproofing" 
This reverts commit e528b65915.
 2016-08-29 19:12:24 -07:00
kevinz000
e528b65915 lavaproofing 2016-08-29 19:01:36 -07:00
Joan Lung
073eed4009 a classic 2016-08-28 21:33:27 -04:00
Joan Lung
566936355a less loops 2016-08-28 21:28:35 -04:00
Joan Lung
58459e6239 fix issue 2016-08-28 21:13:08 -04:00
Joan Lung
9ea303705a fancy 2016-08-28 09:14:22 -04:00
Joan Lung
bfb6fa9c16 Makes lavaland more atmospheric 2016-08-27 23:55:33 -04:00
oranges
251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes 
More Mining Base Tweaks
 2016-08-28 12:38:12 +12:00
oranges
ced523874c Merge pull request #20099 from ChangelingRain/ayesgivenlikeitsallsomeonecansaylikeitstheonlyoptionisjustasbadasgoingonwhentheysayno 
The staff of lava can now turn lava back into basalt
 2016-08-28 12:37:14 +12:00
Incoming5643
424d450dbc Makes the "nothing happened!" option of drake's blood vaguely more entertaining/frustrating (#20144) 
* Makes the "nothing happened!" option of drake's blood vaguely more entertaining by turning those who hit it into a lizardperson approximating the appearance of an ash drake.

* changed the colors to a suggestion of @ChangelingRain
 2016-08-27 16:55:59 -05:00
Joan Lung
325991092b The staff of lava can now turn lava back into basalt 2016-08-25 09:42:41 -04:00
GunHog
42e052af64 More Mining Base Tweaks 
- The remote now no longer has its own dimension settings, it depends
entirely on the map now
- Fixed the mining shuttle turning its docking point into LAVA
 2016-08-25 08:24:17 -05:00
Cheridan
5defa30696 Merge pull request #20062 from ChangelingRain/takepainstohurtnobodywhereyoucanwhereyourmerepresenceisapainleavewhereyourwordsaredaggerscloseyourmouthwhereyoursightisarakinglashcloseyoureyes 
Adds several KA mods and allows mining borgs to install any KA mods
 2016-08-24 13:26:54 -05:00
Joan Lung
8bf7011ab6 Using a resonator on an existing resonator field will immediately detonate that field (#20001) 
* Using a resonator on an existing resonator field will immediately detonate that field

* field updates

* late night code

* buff
 2016-08-24 16:08:28 +12:00
Cheridan
c68ef5909d Merge pull request #20045 from TechnoAlchemisto/dads_coma_was_the_best_thing_to_ever_happen_to_this_family 
Places mining scanners above mining satchels in miner lockers. Also minor sprite changes
 2016-08-23 23:02:01 -05:00
NikNakFlak
fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife 
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
 2016-08-23 17:08:36 -07:00
Joan Lung
d955dacefd hit modkits 2016-08-23 15:51:38 -04:00
Joan Lung
54c1d0ef35 MODS MODS MODS GET EM NOW 2016-08-23 15:26:19 -04:00
Joan Lung
7355d91718 Adds a damage AoE KA mod 2016-08-23 10:37:20 -04:00
GunHog
d8f31dbb55 Aux Mining Base Tweaks (#20015) 
* Aux Mining Base Tweaks

- Multiple landing zones may now be set for the mining base.
- The coordinates of each landing zone is shown in the list.
- Miners now each get a remote in their starting lockers.
- The Aux mining base now requires lighting while on station
- The Aux Mining Base now has a GPS signal.

* More tweaks

- The shuttle landing beacon no longer requires line of sight, just a
distance check.
- Beacon now has a description.
- Landing site name updated
- Adds support for stat logging base drops.

* Mining Shuttle Interface

- The aux base can now interface with the mining shuttle once the
shuttle beacon is deployed near the base.
- Updated descriptions to explain this.

* Launch Warning

Keeps the launch warning without it going off each time it is used to
move the mining shuttle.
 2016-08-23 17:25:01 +12:00
Joan Lung
844ed6786b Merge pull request #20007 from Ergovisavi/power_of_the_power_of_the 
Replaces the fireball book in the Drake chest with a book of Sacred Flame
 2016-08-22 21:02:51 -04:00
Ergovisavi
642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
TechnoAlchemist
77811d5b92 Places mining scanners above mining satchels. 2016-08-22 15:26:59 -07:00
NikNakFlak
b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
Cheridan
84522e7573 Merge pull request #19955 from KorPhaeron/auxbasefix 
Fixes aux base breaking to space
 2016-08-20 23:25:59 -05:00
KorPhaeron
eb39ca8e6e Kinetic Accelerator Mods (#19942) 
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
 2016-08-19 21:04:25 +12:00
Ergovisavi
f163c9e525 Changes to the fulton pack (#19944) 
* Consolidated the fulton packs into one pack
* Allows you to fulton yourself by directly attaching it to yourself
* Consolidated the mining voucher fulton kits into one kit
 2016-08-18 23:07:33 -05:00
KorPhaeron
4bbfa163dd Aux Base Fix 2016-08-18 16:02:37 -05:00
WJohn
b1dc6cd5b7 Adds aux mining base. (#19892) 
* First part of fixes and nondescript shit who even reads these

* all done
 2016-08-18 12:54:58 +12:00
Ergovisavi
8656d3e7eb Adds "Proto-Kinetic Crusher", a melee mining weapon (#19891) 
* Mining Hammer

* Adds the mining hammer "Proto-Kinetic Crusher" item
Makes megafauna a little easier to hit in melee
Makes jaunters and Hivelord cores fit in the mining belt

* Fixing a file that should have been untouched
Other miner (geddit) fixes for the mining hammer
 2016-08-17 14:29:16 +02:00
Cheridan
926b37a91d Merge pull request #19870 from KorPhaeron/ka_overhaul 
Kinetic Accelerator Overhaul [WIP]
 2016-08-16 12:26:10 -05:00
KorPhaeron
e8ec96945c Blackbox 2016-08-15 20:25:38 -05:00
oranges
bf3bb33881 Merge pull request #19852 from KorPhaeron/minebot 
Minebots are less suicidal
 2016-08-15 00:01:47 +12:00
KorPhaeron
100275b85f Kinetic Accelerator Overhaul 2016-08-13 18:06:28 -05:00
Joan Lung
9ba885cd26 Merge pull request #19850 from KorPhaeron/bubblegum_fix 
Fixes a bubblegum related message
 2016-08-13 18:24:22 -04:00
Joan Lung
f70af40620 Merge pull request #19837 from Jordie0608/letsnotquestionwhytheamountoftitaniumwascheckingforbananiumore 
Unhardcodes count and display of ores in ore box
 2016-08-13 08:04:51 -04:00
Jordie0608
c0a749d6b1 properly uniques list display 2016-08-13 15:41:57 +10:00
KorPhaeron
ea92361506 Minebots are less suicidal 2016-08-12 19:46:38 -05:00
KorPhaeron
9b8b460c15 Fixes bubblegum message 2016-08-12 18:45:47 -05:00
Jordie
bcccf41695 unhardcodes count and display of ores 2016-08-12 12:07:46 +10:00
KorPhaeron
9ee67f942a Projectile Dismemberment and Wizard spellblade (#19783) 
* Spellblade

* Plasma cutters and onback sprites

* Cleans up dismemberment projectile code

* Runtime fix
 2016-08-11 15:43:29 +12:00
Cruix
72877e3012 Action Buttons and fixes for minebots (#19718) 
* Added verbs for sentient minebots.

* Changed minebot verbs into action buttons.
 2016-08-09 14:33:54 +12:00
GunHog
bd8784a027 Adds Do_After and Announcement 
- Adds Do_After as comfirmation of setting the colony's location.
- Adds an announcement for when the drop zone is set.
 2016-08-03 18:09:07 -05:00
GunHog
ff9f10a74c Whoops 
>Gun Hog in charge of math
 2016-08-02 10:59:55 -05:00
GunHog
db6b95973e Tweaks 
- Adds Xhuis' suggestion for a badmin version
- Restricts dropping colonies on ruins without being fully inside them.
 2016-08-02 10:57:12 -05:00
KorPhaeron
bed2a5dae4 Can't launch the colony as the clown 2016-07-30 23:39:11 -05:00
KorPhaeron
7111c4391f Adds disguting tumours to meta and box, lets RD and engineering build in those tumours 2016-07-30 20:14:51 -05:00
KorPhaeron
053142b95a You can't power all of lavaland from one apc 2016-07-27 11:42:20 -05:00