cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,099 Commits 61 Branches 14 Tags
aa71a5f2caf7cb4e147d99d42de0cb831aa97c23
Commit Graph

4368 Commits

Author SHA1 Message Date
Cheridan
7b35165549 Merge pull request #2682 from Razharas/BiogenFix 
Biogenerator little fix
 2014-02-09 22:13:36 -06:00
Tenebrosity
e1a0f96846 Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix 
Conflicts:
	code/game/objects/items/weapons/clown_items.dm
 2014-02-09 16:39:50 +13:00
Razharas
17994e728e Merge pull request #2666 from Giacom/spooky_scary_statues 
Adds a new statue hostile mob!
 2014-02-08 11:16:23 -08:00
Razharas
c1f8701bd2 Merge pull request #2655 from MrPerson/NanoSMES 
Nano UI for SMES
 2014-02-08 10:59:27 -08:00
MrPerson
c269999796 Way to leave those debug messages in, self 2014-02-08 10:53:55 -08:00
MrPerson
6488b34533 Merge branch 'master' of https://github.com/tgstation/-tg-station into NanoSMES 
Thanks Razharas, hehe
Merge new SMES vars and Nanou in with constructable SMES and whatnot
 2014-02-08 07:51:28 -08:00
Razharas
98fe9974e0 Biogenerator little fix 
Tiny little fix
 2014-02-08 17:39:06 +04:00
Razharas
7893b99e37 Merge pull request #2661 from Ergovisavi/mob_env_smash_fix 
Fixed hostile mobs hitting grilles and the like through windows (again)
 2014-02-08 04:37:26 -08:00
Razharas
001943460c Merge pull request #2653 from Incoming5643/syndiborgchance 
Adds a chance of syndiborg to the staff of change
 2014-02-08 04:15:46 -08:00
Razharas
4ea05add26 Merge pull request #2649 from YotaXP/lighting-squared 
Reduced the potency of carrying multiple light sources.
 2014-02-08 04:13:57 -08:00
Razharas
0d1da7615c Merge pull request #2646 from Incoming5643/minorminer 
Gives mining borgs an analyzer so they can defuse gibtonite properly
 2014-02-08 04:07:33 -08:00
Razharas
b19084569d Merge pull request #2624 from adrix89/Fixes 
Fixes
 2014-02-08 04:03:50 -08:00
Ergovisavi
93af6f629c Fixed hostile mobs hitting objects through windows and the like (again) 
Removed mouse_opacity = 2 from default hostile mobs
 2014-02-07 20:56:11 -08:00
Giacomand
3a8f8113fc The statue will call dust() when gibbed. 
Increased the range of blind() so mobs just outside his can_be_seen() check won't stop it from blinding them.
Added a client check for AI stuff.
 2014-02-07 23:26:17 +00:00
Razharas
863e6aa947 Merge pull request #2617 from Tenebrosity/thudfix 
Fixes #2603: Bodyfall thuds in cryo and cloning
 2014-02-07 12:35:44 -08:00
Razharas
0aed48193c Merge pull request #2626 from adrix89/slip_rework2 
Slip rework the second encounter
 2014-02-07 12:24:08 -08:00
Giacomand
d6dad8cbf2 Changed their name and description so they almost match with the ordinary statues. 2014-02-07 20:07:48 +00:00
Giacomand
b5ece48138 Fixed statues trying to attack mice behind walls. 
Buffed their speed and damage.
Reduced their vision range a bit.
Statues will now attack nearby mobs when after a target.
 2014-02-07 17:44:36 +00:00
fleure
26d4625ee7 Merge pull request #2488 from Razharas/OkLetsTryThis 
Machines overhaul 2: MERGE LIKE SANIC
 2014-02-07 13:06:48 +00:00
Razharas
2a5e2ae021 SMES board fix 
Blind copypaste is bad
 2014-02-07 16:39:06 +04:00
Razharas
df61e734ab Quick fix to designs and boards 
Abloobloo
 2014-02-07 12:25:29 +04:00
Razharas
2666ba1e8b Fixes incorrect cables conflict issue 
They work again
 2014-02-07 07:07:31 +04:00
Giacomand
fc398b3545 Merge branch 'master' of https://github.com/tgstation/-tg-station into spooky_scary_statues 2014-02-06 21:38:55 +00:00
Giacomand
42ecb2471f Adds a new statue hostile mob! 
This hostile mob is very much like other monsters that move/kill you when you don't look at them.
This mob is also designed to be player controlled and has spells to get around the 360 vision problem, such as flickering lights and causing people around it to go blind for a short duration.

CANPUSH is now used by simple_animals
Added 4 directional sprites for the statue.
 2014-02-06 20:28:15 +00:00
fleure
bc733a83a4 Merge pull request #2650 from Giacom/master 
MiniStation Update
 2014-02-06 20:14:25 +00:00
Razharas
2d125f0fc5 And more fixes 
The ride never ends
 2014-02-06 22:32:28 +04:00
Razharas
a589387ccf Fixing merge conflicts 
THis is getting harder and harder
 2014-02-06 22:26:16 +04:00
Razharas
c0aa3b56bb Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/aifixer.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/power/apc.dm
	code/modules/research/server.dm
	icons/obj/stationobjs.dmi

Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours
 2014-02-06 22:05:39 +04:00
adrix89
5e05401541 properly fix rune cleaning 2014-02-06 17:35:48 +02:00
adrix89
413e14425f Runes are now cleaned by holy water. 2014-02-06 14:10:01 +02:00
MrPerson
a5eb0b5bbe On second thought, allow turning input/output on and off on SMES no matter what. 
Also added a messages telling you specifically if the SMES is actually charging or outputting.

Also clean up some unnecessary shit.
 2014-02-05 23:49:04 -08:00
Tenebrosity
2b978e5da7 Fixes merge conflicts and removes excess message 2014-02-06 20:30:43 +13:00
adrix89
dfa1c8c363 Fine! removed ability to clean up runes 2014-02-06 09:12:32 +02:00
adrix89
23ba2a310a Merged duplicates 2014-02-06 09:07:43 +02:00
Tenebrosity
8a6bcf61f7 Fixes #2603: Bodyfall thuds in cryo and cloning 
All carbon mobs have fall sounds now.
Fall sounds are now called by the turf the faller is on, not the faller
themselves.
Thank you Razharas for generously helping me with this.
 2014-02-06 18:32:31 +13:00
MrPerson
41d1189156 Emergency fix for a projectile runtime 
Emitters (and probably turrets) never clicked anything so this var is null. Starting the singulo = emitter shots never move and runtime constantly.
 2014-02-05 21:28:54 -08:00
Tenebrosity
6db5fb3534 Fixes runtime with seed extractor 
Also removes unnecessary drop proc call on bluespace tomatoes, throwing
them updates the hand icon.
 2014-02-06 15:09:03 +13:00
Tenebrosity
6f202788ea Fixes #2396 and #2395 
- Banana peels are now grown weapons
- Banana peel slip duration is now based on their potency
- Clown spawns with a 50 potency banana, which is both regular sized and
produces a skin that's nice and slippery~
- Fixes nettle and deathnettle inhands not disappearing upon use
- Makes nettle and deathnettles use the hitsound variable instead of the
playsound proc directly. Now their hitsounds will scale in volume based
on damage done.
- Makes the banana mortar shoot potency 65 banana peels. Because
otherwise it'd shoot laughably tiny and short in slip duration potency
-1 ones.
- Moves corncobs to be grown weapons and updates their paths. Now their
size will scale based on the size of the corn that spawned them.
- Updates banan paths :)
 2014-02-06 13:47:39 +13:00
MrPerson
c8144bc5c6 Nano UI for SMES 
Screenshot:
http://imgur.com/63D3f8b
Buttons are greyed because there's no input available.
 2014-02-05 16:32:07 -08:00
Incoming
db5602b34a Adds a chance of syndiborg to the staff of change. 
Odds of syndiborg are 5%, odds of normal borg are now 11.666...%, down from 16.666...%

syndiborgs spawn with their default lawset, which means that they can (and almost certainly will) try to kill everyone if left to their own devices
 2014-02-05 18:48:06 -05:00
Giacomand
7319456770 MiniStation Update 
Fixes a runtime with the vent clogging event, which happens to MiniStation.
Lowered all vent requirements to 20.
Fixed transit tubes from breaking by reversing the pod direction twice.
Changed the icon state name of the terminators so that they had density.
Transit tubes will now reset the view of the mob exiting.
 2014-02-05 22:04:58 +00:00
YotaXP
6db2c59772 Reduced the potency of carrying multiple light sources. 2014-02-05 16:54:46 -05:00
Cheridan
5c253c9259 Merge pull request #2644 from Razharas/CableCoilsFixings 
Fixes cable coils
 2014-02-05 13:14:59 -06:00
fleure
26afced91b Merge pull request #2629 from Giacom/master 
MiniStation Update
 2014-02-05 18:38:03 +00:00
fleure
fd81304128 Merge pull request #2612 from Mercenaryblue/master 
The LaserTag update: Part one
 2014-02-05 18:31:08 +00:00
Incoming
2efdc43bdb Gives mining borgs an analyzer so they can defuse gibingtonite properly 2014-02-05 13:16:04 -05:00
Razharas
caea1d5108 Fixes cable coils 
So glad can code again, probably addicted to it
 2014-02-05 19:45:33 +04:00
MrPerson
931da9e7ef Many changes 
Much diff
 2014-02-04 22:49:38 -08:00
Razharas
061b6aab4a Merge pull request #2607 from adrix89/Fix_1653 
Fix 1653
 2014-02-04 17:40:30 -08:00
Giacomand
a27a03c11f The infestation events will now work correctly on MiniStation. 2014-02-04 20:26:30 +00:00