cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 19:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,443 Commits 62 Branches 14 Tags
8035651400df332dcb4e56ef919aa2ccb486b026
Commit Graph

17227 Commits

Author SHA1 Message Date
Shadowlight213
8035651400 Finishes id computer 
adds designs for computer parts to rnd and cases to the autolathe.
 2016-08-09 22:55:07 -07:00
Shadowlight213
6bb69d760e Id computer mostly complete 
Various fixes and improvements.
 2016-08-08 00:40:03 -07:00
Shadowlight213
bec5eaa893 librarian 2016-08-07 00:06:29 -07:00
Shadowlight213
2f330babb7 testmerge feedback 2016-08-07 00:01:50 -07:00
Shadowlight213
d155070662 Removes a couple vars in arguments. 2016-08-06 23:08:06 -07:00
Shadowlight213
4ebeec67d6 Adds header icons 
Does some fixes and cleanup
Some consoles added to the map and tablets added to job loadouts for testmerging.
 2016-08-06 23:05:05 -07:00
Shadowlight213
3628d1b9df Merge branch 'master' of https://github.com/tgstation/tgstation into bayputers 2016-08-05 23:15:39 -07:00
Shadowlight213
fb0034ff48 Fix access. 2016-08-05 23:14:51 -07:00
Shadowlight213
0c9554cd35 Base systems pretty much done. 
Still need to convert the id computer program.
 2016-08-05 22:51:53 -07:00
oranges
2b675607ad Revert "Colossus will now chase down sleeping carp users" 2016-08-06 14:15:37 +12:00
oranges
e3e6ea5859 Merge pull request #19703 from AnturK/adminabuse 
Various admin requested minor features.
 2016-08-06 13:31:25 +12:00
oranges
816ac1b974 Merge pull request #19699 from ChangelingRain/aslethalasathoughtaslethalascuttingoffsomethingyoureusingtostayalive 
Colossus will now chase down sleeping carp users
 2016-08-06 13:29:53 +12:00
Joan Lung
797fb96bac Merge pull request #19698 from MrStonedOne/patch-235 
Makes black box code less retarded
 2016-08-05 21:23:34 -04:00
Joan Lung
672577c956 Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677) 
* Hyper-kinetics will no longer cause gibtonite to instantly explode

* how... likely is that
 2016-08-05 17:51:12 -05:00
Razharas
07813e056f Merge pull request #19695 from ChangelingRain/prettythingsarelikeyourownvanguardawaytostaveofffalteringforjustalittlemoretime 
Hostile ranged mobs will now properly use ranged attacks on mobs that can't be melee attacked
 2016-08-05 16:20:44 +03:00
Shadowlight213
5d9bc548a2 More WIP 
Majority of base systems done.
 2016-08-05 01:00:51 -07:00
oranges
f8b2c6b377 Merge pull request #19642 from GunHog/Colony_Drop_Revival 
Colony Drop (code only)
 2016-08-05 12:10:41 +12:00
oranges
9863833219 Merge pull request #19688 from Cruix/gas_mix_fix 
Possibly fixes a possible bug in possible atmos code.
 2016-08-05 12:09:06 +12:00
oranges
146bbdff45 Merge pull request #19687 from lzimann/patch-12 
Holy water no longer adds confusion
 2016-08-05 12:08:50 +12:00
oranges
6144d30b6f Merge pull request #19684 from Incoming5643/Hashtag_Bird_Problems 
Parrot stress relief pull 2016
 2016-08-05 12:07:44 +12:00
oranges
e5f8f2bc1f Merge pull request #19681 from Cruix/buckled_mobs_fix 
Added some has_buckled_mobs() checks.
 2016-08-05 12:07:02 +12:00
oranges
24480170ab Merge pull request #19671 from frtbngll/frtbngllbranch 
Limitied the amount of minions the Paper Wizard can summon to 9.
 2016-08-05 12:04:36 +12:00
lordpidey
9d07476ab7 adds growth serum, puts it in fly amanita (#19654) 
* adds growth serum, puts it in fly amanita

* changes reagent check to cycle check

* Growth serum now works, and if you have more than 20 units in you at a time, you will pulsate between sizes.

* Update other_reagents.dm

Removes erroneous typecast.
 2016-08-05 11:58:19 +12:00
Joan Lung
444d3d283d Hostile mobs will now aggro if hit by offscreen projectiles (#19680) 
* Hostile mobs will now aggro if hit by offscreen projectiles

* adjust

* forget
 2016-08-05 11:56:47 +12:00
oranges
ff4cafab1d Merge pull request #19676 from ChangelingRain/hangupallmyfragilethoughtsdisplayedthatyoumightseeaspaceadropaclothacomfortoffrailitiesinme 
Improves bubblegum's jaunt code
 2016-08-05 11:56:12 +12:00
oranges
789c644f42 Merge pull request #19675 from ChangelingRain/idontneedtobeseenijustneedtospeakupbeheardinsteadofclosingupclosingoffnotreachingout 
Improves colossus code
 2016-08-05 11:55:48 +12:00
oranges
12d2b027e1 Merge pull request #19673 from PKPenguin321/home-run 
Adds home run baseball burger
 2016-08-05 11:55:37 +12:00
Cheridan
c7d78a9a44 Merge pull request #19679 from Fox-McCloud/whyyyyyyyyy 
WHYYY DEL WHY
 2016-08-04 15:13:50 -05:00
AnturK
24187e7633 Adds cult,clockworck and massdelete generators to buildmode 2016-08-04 21:02:40 +02:00
AnturK
a2b80f7f52 What song is this? 2016-08-04 21:01:29 +02:00
Joan Lung
81bc85bd28 oh god factor; check 2016-08-04 12:58:14 -04:00
Razharas
248f45464b Merge pull request #19657 from ChangelingRain/itdbesaferitsalwayssafertojustbequiettonotspeakuptohidelikeachickinitsegg 
Plasma cutters have double range in low pressure
 2016-08-04 18:31:12 +03:00
Joan Lung
bc4f309aa7 actually that was not threatening enough 2016-08-04 11:18:56 -04:00
Joan Lung
edb72f83e3 Colossus will now chase down sleeping carp users 2016-08-04 10:40:32 -04:00
Kyle Spier-Swenson
96f18cce3a ugh 2016-08-04 04:55:16 -07:00
Kyle Spier-Swenson
fe39fe642d fixes compile error 2016-08-04 04:39:11 -07:00
Kyle Spier-Swenson
f41e3af378 Makes black box code less retarded 
Not returning when qdeling for dupe (from killing a second colossus) caused byond to ***hard delete*** the entire contents, as they wouldn't be in the contents when destroy() ran, but would be when the garbage collector hard deleted it.

Hard deleting the 200 some items people decided to put in this thing takes awhile, a long ass while.

Also made the code faster and less loopy and more up-to-date with current systems.
 2016-08-04 04:29:07 -07:00
Joan Lung
0e4a3ae3b7 god 2016-08-04 00:15:09 -04:00
Joan Lung
39e37b488e Hostile ranged mobs will now properly use ranged attacks on mobs that can't be melee attacked 2016-08-03 23:53:13 -04: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
Leo
d03941f997 Holy water no longer adds confusion 2016-08-03 19:11:08 -03:00
Incoming
cf6df82a62 Parrot stress relief pull: 
Buffs parrots health from 20 to 80.
Parrots have gone from opportune attackers (attack weak babies) to aggressive idiots (attack so long as I have good health)
Fixes a obscure little bug where a parrot left alone without anyone to hear them couldn't speak through radios.
Ghost poly can now posses people who try to attack them and force them to spout parrot lines.
The ghost poly easter egg now has a very rare chance of happening every time poly dies.
 2016-08-03 17:09:01 -04:00
Joan Lung
ce738acca7 touch 2016-08-03 12:46:32 -04:00
Fox-McCloud
c021879ac0 WHYYY DEL WHY 2016-08-03 11:33:07 -04:00
Joan Lung
82bd165e17 Improves bubblegum's jaunt code 2016-08-03 08:29:34 -04:00
Joan Lung
dbbfda6ff1 Improves colossus code 2016-08-03 08:25:20 -04:00
unknown
02f18af893 Fixed a bug in atmos code. 2016-08-03 03:10:41 -07:00
PKPenguin321
936767a662 sheeeit 2016-08-03 00:22:27 -07:00
PKPenguin321
96dbd5c326 home run 2016-08-03 00:18:41 -07:00
unknown
5ea9203c7f Added some has_buckled_mobs() checks. 2016-08-02 23:39:29 -07:00