cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,670 Commits 62 Branches 14 Tags
f31cc6e6cffa74754ed327debaefe49f833801e3
Commit Graph

14022 Commits

Author SHA1 Message Date
Robustin
f31cc6e6cf Update uplink_item.dm 2016-02-22 16:31:44 -05:00
Robustin
c535ea783e Update human.dm 2016-02-22 16:28:42 -05:00
Robustin
d9c6dfce73 Update mob_helpers.dm 2016-02-22 16:27:28 -05:00
Robustin
320b1e958c Update mob_helpers.dm 2016-02-22 13:24:08 -05:00
Cheridan
9766395322 Merge pull request #15355 from tkdrg/yeah 
Improves admin counting for irc
 2016-02-22 01:27:43 -06:00
Cheridan
d6d8f59db4 Merge pull request #15445 from Shadowlight213/Syndieboom 
Fixes away mission loot station balance by removing loot drops from syndicate simple mobs.
 2016-02-21 23:15:47 -06:00
Cheridan
56d68ce31f Merge pull request #15614 from CPTANT/staminabuffnew 
buffs stamina regeneration take 2
 2016-02-21 20:12:44 -06:00
Cheridan
050d6f4070 Merge pull request #15636 from Buggy123/patch-19 
Dice of fate is now reusable
 2016-02-21 20:11:26 -06:00
tkdrg
3ad21db02f Merge pull request #15647 from Boredone/master 
Fixs Breach Slugs Magazines
 2016-02-21 22:16:34 -03:00
Joan Lung
8109c83033 Merge pull request #15643 from tkdrg/old 
VV path edit will now use spawn-style dialogs
 2016-02-21 20:12:20 -05:00
Joan Lung
b08f6d9c22 Merge pull request #15624 from phil235/DwarfFix 
Fixes being able to become huge with genetics
 2016-02-21 19:29:51 -05:00
tkdrg
4cf728cd5e Merge pull request #15642 from AnturK/random_things 
Minor fixes
 2016-02-21 10:21:13 -03:00
Joan Lung
ab658b9e24 Merge pull request #15628 from PKPenguin321/patch-13 
[s] Fixes nasty cleanbot bug
 2016-02-20 17:47:46 -05:00
Boredone
40005aca32 Hope I didn't mess up here as I didn't branch off earlier changes. 2016-02-20 15:34:01 -07:00
tkdrg
001b575898 Merge pull request #15151 from CPTANT/laserfire 
Laser beams may now set you on fire
 2016-02-20 19:19:22 -03:00
Tkdrg
4390482fac Merge branch 'Shadowlight213-Soundflip' into HEAD 
Closes #15502
 2016-02-20 16:00:11 -03:00
Shadowlight213
07565ffaa5 Reverses Announcement sound pref to hopefully fix it starting off. 2016-02-20 15:59:15 -03:00
tkdrg
9eb1ff8274 Merge pull request #15625 from phil235/WearmaskInternalIconFix 
Fixes internals not being turned off immediately when adjusting your mask off
 2016-02-20 15:03:16 -03:00
Cheridan
0c0d30a0f0 Merge pull request #15640 from tkdrg/kinder_egg_coding 
Fixes the nar-sie event the right way.
 2016-02-20 11:32:05 -06:00
AnturK
ceb9af945c Removes typo. 
Makes Load Template verb get turf after input.
 2016-02-20 18:12:20 +01:00
CPTANT
5f92894e70 removes firestacking 2016-02-20 16:47:39 +01:00
Tkdrg
6563543b5f VV path edit will now use spawn-style dialogs 2016-02-20 12:09:16 -03:00
tkdrg
f81e52c164 Merge pull request #15605 from phil235/StreamSpray 
Spray bottles now have a "stream" mode toggled by clicking the bottle.
 2016-02-20 11:56:33 -03:00
AnturK
1a59dbaee1 Fixes Experimentor runtime 2016-02-20 15:39:15 +01:00
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
tkdrg
0c55904f2a Merge pull request #15623 from Core0verload/runtime 
Fixes a spacewalking runtime
 2016-02-20 10:00:05 -03:00
tkdrg
a51c987ae2 Merge pull request #15589 from KorPhaeron/weather2 
Fixes up weather performance
 2016-02-20 09:31:12 -03:00
tkdrg
29ffc7ef16 Merge pull request #15213 from xxalpha/future 
Kinetic accelerators automatically reload.
 2016-02-20 09:06:51 -03:00
Tkdrg
734e57828f Fixes the nar-sie event the right way. 
Weight 0 events still run for some stupid reason, they're just rare.
 2016-02-20 08:46:02 -03:00
KazeEspada
e36c114ddf Fixes endless Nar-sies. 
Hopefully this fixes the endless nar-sie storm.
 2016-02-20 02:12:39 -07:00
Buggy123
18d24dc2b8 Fixed syntax 2016-02-20 00:54:04 -05:00
Buggy123
cc5f1b2179 Dice of fate is now reusable 2016-02-20 00:48:47 -05:00
tkdrg
78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh 
Added new event: portal storm.
 2016-02-19 21:08:16 -03:00
tkdrg
b0c10f910c Merge pull request #15611 from optimumtact/patch-1 
Improve admin bomb verb
 2016-02-19 19:47:39 -03:00
xxalpha
cdd2673b15 Lower weight, later start. 2016-02-19 22:41:12 +00:00
PKPenguin321
db419d8008 makes the acid value even lower 
by request
 2016-02-19 13:57:09 -08:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob 
Blobbernauts and blob spores are now immune to blob chemicals
 2016-02-19 15:51:41 -06:00
PKPenguin321
0fe58646c6 fixes massive math error in cleanbot.dm 
turns out that as it would happen, testing your code doesn't always account for things like this
that being said, this is tested and still strong, but not 1200 damage strong
 2016-02-19 12:43:43 -08:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
phil235
887822edd5 Fixes being able to become huge by injecting yourself with dwarfism while having mutadone in you. The resizing now happens instantly and no longer waits for the next life() call. 
Fixes resizing. It was broken because I had removed update_canmove() call in living/life(). Now every part of the code that modifies resize directly calls update_transform().

Fixes mob seeing two messages when acquiring (or losing) the dwarfism mutation.
 2016-02-19 18:32:29 +01:00
Cheridan
24d17307a3 Merge pull request #15587 from phil235/EffectMorphineFix 
Fixes certain reagent making you sleep/be stunned/blind for just a split second every tick
 2016-02-19 11:18:50 -06:00
phil235
9ece63edfe Fixes internals not being turned off immediately when adjusting your mask off. 2016-02-19 17:49:38 +01:00
c0
0bb0c58e6d Fixes a spacewalking runtime 2016-02-19 13:20:09 +03:00
duncathan salt
db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2 
Adds the new pun pun to the maps
 2016-02-19 04:09:18 -06:00
duncathan salt
ad11039232 Merge pull request #15568 from PKPenguin321/patch-13 
Pisses off the cleanbots
 2016-02-18 18:00:21 -06:00
tkdrg
cc2ec12488 Merge pull request #15590 from KorPhaeron/icepacks 
glorf jumpsuit
 2016-02-18 20:37:20 -03:00
Incoming5643
611248a4f8 Fixes Travis 2016-02-18 18:27:35 -05:00
oranges
b6c0aa64b6 Set bomb epicenter after chosing splosion size 
:weed:
 2016-02-19 11:32:42 +13:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob. 
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
 2016-02-18 17:11:59 -05:00
CPTANT
cd0a866daa buffs stamina regeneration 2016-02-18 22:53:49 +01:00